Convert to GH_TUPLE.

Sponsored by:	Absolight

1 files changed, 54 insertions, 166 deletions

diff --git a/www/grafana3/Makefile b/www/grafana3/Makefile
index 9dbb998fa761..42cf884a14c7 100644
--- a/www/grafana3/Makefile
+++ b/www/grafana3/Makefile
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
-PORTNAME=	grafana3
+PORTNAME=	grafana
 PORTVERSION=	3.1.1
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
+PKGNAMESUFFIX=	3
 CATEGORIES=	www
 
 MAINTAINER=	jhixson@gmail.com
@@ -16,47 +17,57 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_RC_SUBR=	grafana3
-TAG=	${DISTVERSIONPREFIX}${PORTVERSION}
 
 USES=	compiler
 
 USE_GITHUB=	yes
 
-GH_ACCOUNT=	grafana BurntSushi:toml Unknwon:com aws:aws_sdk_go \
-	bmizerany:assert bradfitz:gomemcache codegangsta:cli \
-	davecgh:go_spew fatih:color franela:goreq go-ini:ini go-ldap:ldap \
-	go-macaron:binding,gzip,inject,session go-sql-driver:mysql \
-	go-stack:stack go-xorm:core,xorm gorilla:websocket gosimple:slug \
-	hashicorp:go_version inconshreveable:log15 jmespath:go_jmespath \
-	jtolds:gls klauspost:compress,cpuid,crc32 kr:pretty,text lib:pq \
-	mattn:go_colorable,go_isatty,go_sqlite3 rainycape:unidecode \
-	smartystreets:goconvey streadway:amqp golang:net,oauth2,sys \
-	go-asn1-ber:asn1_ber go-bufio:bufio go-macaron:macaron \
-	go-redis:redis jhixson74:grafana_public
-
-GH_PROJECT=	grafana toml:toml com:com aws-sdk-go:aws_sdk_go \
-	assert:assert gomemcache:gomemcache cli:cli go-spew:go_spew \
-	color:color goreq:goreq ini:ini ldap:ldap binding:binding \
-	gzip:gzip inject:inject session:session mysql:mysql stack:stack \
-	core:core xorm:xorm websocket:websocket slug:slug \
-	go-version:go_version log15:log15 go-jmespath:go_jmespath gls:gls \
-	compress:compress cpuid:cpuid crc32:crc32 pretty:pretty text:text \
-	pq:pq go-colorable:go_colorable go-isatty:go_isatty \
-	go-sqlite3:go_sqlite3 unidecode:unidecode goconvey:goconvey \
-	amqp:amqp net:net oauth2:oauth2 sys:sys asn1-ber:asn1_ber \
-	bufio:bufio macaron:macaron redis:redis grafana_public:grafana_public
-
-GH_TAGNAME=	${TAG} v0.2.0:toml v1:com v1.1.36:aws_sdk_go \
-	release.r60:assert release.r60:gomemcache v1.17.0:cli \
-	5215b55:go_spew v0.1:color fc08df6:goreq v1.12.0:ini v2.3.0:ldap \
-	bd00823:binding cad1c65:gzip c5ab7bf:inject 66031fc:session \
-	v1.2:mysql v1.5.2:stack v0.5.3:core v0.5.3:xorm v1.0.0:websocket \
-	v1.0:slug 0181db4:go_version v2.11:log15  0b12d6b:go_jmespath \
-	v4.2.0:gls v1.0:compress v1.0:cpuid v1.0:crc32 add1dbc:pretty \
-	7cafcd8:text e2402a7:pq v0.0.5:go_colorable v0.0.1:go_isatty \
-	v1.1.0:go_sqlite3 cb7f23e:unidecode c53abc9:goconvey 2e25825:amqp \
-	bc3663d:net 65a8d08:oauth2 62bee03:sys v1:asn1_ber v1:bufio \
-	v1:macaron v2:redis ${TAG}:grafana_public
+GH_TUPLE= \
+	BurntSushi:toml:v0.2.0:toml/src/github.com/BurntSushi/toml                                       \
+	Unknwon:com:v1:com/src/github.com/Unknwon/com                                                    \
+	aws:aws-sdk-go:v1.1.36:aws_sdk_go/src/github.com/aws/aws-sdk-go                                  \
+	bmizerany:assert:release.r60:assert/src/github.com/bmizerany/assert                              \
+	bradfitz:gomemcache:release.r60:gomemcache/src/github.com/bradfitz/gomemcache                    \
+	codegangsta:cli:v1.17.0:cli/src/github.com/codegangsta/cli                                       \
+	davecgh:go-spew:5215b55:go_spew/src/github.com/davecgh/go-spew                                   \
+	fatih:color:v0.1:color/src/github.com/fatih/color                                                \
+	franela:goreq:fc08df6:goreq/src/github.com/franela/goreq                                         \
+	go-ini:ini:v1.12.0:ini/src/gopkg.in/ini.v1                                                       \
+	go-ldap:ldap:v2.3.0:ldap/src/github.com/go-ldap/ldap                                             \
+	go-macaron:binding:bd00823:binding/src/github.com/go-macaron/binding                             \
+	go-macaron:gzip:cad1c65:gzip/src/github.com/go-macaron/gzip                                      \
+	go-macaron:inject:c5ab7bf:inject/src/github.com/go-macaron/inject                                \
+	go-macaron:session:66031fc:session/src/github.com/go-macaron/session                             \
+	go-sql-driver:mysql:v1.2:mysql/src/github.com/go-sql-driver/mysql                                \
+	go-stack:stack:v1.5.2:stack/src/github.com/go-stack/stack                                        \
+	go-xorm:core:v0.5.3:core/src/github.com/go-xorm/core                                             \
+	go-xorm:xorm:v0.5.3:xorm/src/github.com/go-xorm/xorm                                             \
+	gorilla:websocket:v1.0.0:websocket/src/github.com/gorilla/websocket                              \
+	gosimple:slug:v1.0:slug/src/github.com/gosimple/slug                                             \
+	hashicorp:go-version:0181db4:go_version/src/github.com/hashicorp/go-version                      \
+	inconshreveable:log15:v2.11:log15/src/github.com/inconshreveable/log15                           \
+	jmespath:go-jmespath:0b12d6b:go_jmespath/src/github.com/jmespath/go-jmespath                     \
+	jtolds:gls:v4.2.0:gls/src/github.com/jtolds/gls                                                  \
+	klauspost:compress:v1.0:compress/src/github.com/klauspost/compress                               \
+	klauspost:cpuid:v1.0:cpuid/src/github.com/klauspost/cpuid                                        \
+	klauspost:crc32:v1.0:crc32/src/github.com/klauspost/crc32                                        \
+	kr:pretty:add1dbc:pretty/src/github.com/kr/pretty                                                \
+	kr:text:7cafcd8:text/src/github.com/kr/text                                                      \
+	lib:pq:e2402a7:pq/src/github.com/lib/pq                                                          \
+	mattn:go-colorable:v0.0.5:go_colorable/src/github.com/mattn/go-colorable                         \
+	mattn:go-isatty:v0.0.1:go_isatty/src/github.com/mattn/go-isatty                                  \
+	mattn:go-sqlite3:v1.1.0:go_sqlite3/src/github.com/mattn/go-sqlite3                               \
+	rainycape:unidecode:cb7f23e:unidecode/src/github.com/rainycape/unidecode                         \
+	smartystreets:goconvey:c53abc9:goconvey/src/github.com/smartystreets/goconvey                    \
+	streadway:amqp:2e25825:amqp/src/github.com/streadway/amqp                                        \
+	golang:net:bc3663d:net/src/golang.org/x/net                                                      \
+	golang:oauth2:65a8d08:oauth2/src/golang.org/x/oauth2                                             \
+	golang:sys:62bee03:sys/src/golang.org/x/sys                                                      \
+	go-asn1-ber:asn1-ber:v1:asn1_ber/src/gopkg.in/asn1-ber.v1                                       \
+	go-bufio:bufio:v1:bufio/src/gopkg.in/bufio.v1                                                    \
+	go-macaron:macaron:v1:macaron/src/gopkg.in/macaron.v1                                            \
+	go-redis:redis:v2:redis/src/gopkg.in/redis.v2                                                    \
+	jhixson74:grafana_public:${DISTVERSIONFULL}:grafana_public
 
 GRAFANA_USER?=	grafana
 GRAFANA_GROUP?=	grafana
@@ -65,11 +76,11 @@ USERS=	${GRAFANA_USER}
 GROUPS=	${GRAFANA_GROUP}
 
 GRAFANAHOMEDIR=	${PREFIX}/share/grafana/
-GRAFANADATADIR=	/var/db/${PORTNAME}/
-GRAFANALOGDIR=	/var/log/${PORTNAME}/
-GRAFANAPIDDIR=	/var/run/${PORTNAME}/
-GRAFANAPLUGINDIR=	/var/db/${PORTNAME}/plugins
-GRAFANADASHBOARDDIR=	/var/db/${PORTNAME}/dashboards
+GRAFANADATADIR=	/var/db/${PKGBASE}/
+GRAFANALOGDIR=	/var/log/${PKGBASE}/
+GRAFANAPIDDIR=	/var/run/${PKGBASE}/
+GRAFANAPLUGINDIR=	/var/db/${PKGBASE}/plugins
+GRAFANADASHBOARDDIR=	/var/db/${PKGBASE}/dashboards
 
 SUB_FILES=	grafana3 grafana3.conf
 SUB_LIST+=	GRAFANA_USER=${GRAFANA_USER} \
@@ -91,135 +102,12 @@ post-extract:
 	.jscs.json .jsfmtrc .jshintrc appveyor.yml benchmarks bower.json \
 	build.go CHANGELOG.md circle.yml conf docker docs emails examples \
 	Godeps Gruntfile.js karma.conf.js latest.json LICENSE.md Makefile \
-	NOTICE.md package.json packaging pkg public README.md symlink_git_hooks.sh \
+	NOTICE.md package.json packaging pkg README.md symlink_git_hooks.sh \
 	tasks test.sh tests trigger_grafana_packer.sh tsconfig.json \
 	tsd.json tslint.json vendor
 	@${MV} ${WRKSRC}/${src} \
 		${WRKSRC}/src/github.com/grafana/grafana
 .endfor
-	@${MKDIR} ${WRKSRC}/src/github.com/BurntSushi
-	@${MKDIR} ${WRKSRC}/src/github.com/Unknwon
-	@${MKDIR} ${WRKSRC}/src/github.com/aws
-	@${MKDIR} ${WRKSRC}/src/github.com/bmizerany
-	@${MKDIR} ${WRKSRC}/src/github.com/bradfitz
-	@${MKDIR} ${WRKSRC}/src/github.com/codegangsta
-	@${MKDIR} ${WRKSRC}/src/github.com/davecgh
-	@${MKDIR} ${WRKSRC}/src/github.com/fatih
-	@${MKDIR} ${WRKSRC}/src/github.com/franela
-	@${MKDIR} ${WRKSRC}/src/github.com/go-ini
-	@${MKDIR} ${WRKSRC}/src/github.com/go-ldap
-	@${MKDIR} ${WRKSRC}/src/github.com/go-macaron
-	@${MKDIR} ${WRKSRC}/src/github.com/go-sql-driver
-	@${MKDIR} ${WRKSRC}/src/github.com/go-stack
-	@${MKDIR} ${WRKSRC}/src/github.com/go-xorm
-	@${MKDIR} ${WRKSRC}/src/github.com/gorilla
-	@${MKDIR} ${WRKSRC}/src/github.com/gosimple
-	@${MKDIR} ${WRKSRC}/src/github.com/hashicorp
-	@${MKDIR} ${WRKSRC}/src/github.com/inconshreveable
-	@${MKDIR} ${WRKSRC}/src/github.com/jmespath
-	@${MKDIR} ${WRKSRC}/src/github.com/jtolds
-	@${MKDIR} ${WRKSRC}/src/github.com/klauspost
-	@${MKDIR} ${WRKSRC}/src/github.com/kr
-	@${MKDIR} ${WRKSRC}/src/github.com/lib
-	@${MKDIR} ${WRKSRC}/src/github.com/mattn
-	@${MKDIR} ${WRKSRC}/src/github.com/rainycape
-	@${MKDIR} ${WRKSRC}/src/github.com/smartystreets
-	@${MKDIR} ${WRKSRC}/src/github.com/streadway
-	@${MKDIR} ${WRKSRC}/src/golang.org/x
-	@${MKDIR} ${WRKSRC}/src/gopkg.in/asn1-ber.v1
-	@${MKDIR} ${WRKSRC}/src/gopkg.in/bufio.v1
-	@${MKDIR} ${WRKSRC}/src/gopkg.in/ini.v1
-	@${MKDIR} ${WRKSRC}/src/gopkg.in/macaron.v1
-	@${MKDIR} ${WRKSRC}/src/gopkg.in/redis.v2
-	@${MV} ${WRKSRC_toml} \
-		${WRKSRC}/src/github.com/BurntSushi/toml
-	@${MV} ${WRKSRC_com} \
-		${WRKSRC}/src/github.com/Unknwon/com
-	@${MV} ${WRKSRC_aws_sdk_go} \
-		${WRKSRC}/src/github.com/aws/aws-sdk-go
-	@${MV} ${WRKSRC_assert} \
-		${WRKSRC}/src/github.com/bmizerany/assert
-	@${MV} ${WRKSRC_gomemcache} \
-		${WRKSRC}/src/github.com/bradfitz/gomemcache
-	@${MV} ${WRKSRC_cli} \
-		${WRKSRC}/src/github.com/codegangsta/cli
-	@${MV} ${WRKSRC_go_spew} \
-		${WRKSRC}/src/github.com/davecgh/go-spew
-	@${MV} ${WRKSRC_color} \
-		${WRKSRC}/src/github.com/fatih/color
-	@${MV} ${WRKSRC_goreq} \
-		${WRKSRC}/src/github.com/franela/goreq
-	@${MV} ${WRKSRC_ldap} \
-		${WRKSRC}/src/github.com/go-ldap/ldap
-	@${MV} ${WRKSRC_binding} \
-		${WRKSRC}/src/github.com/go-macaron/binding
-	@${MV} ${WRKSRC_gzip} \
-		${WRKSRC}/src/github.com/go-macaron/gzip
-	@${MV} ${WRKSRC_inject} \
-		${WRKSRC}/src/github.com/go-macaron/inject
-	@${MV} ${WRKSRC_session} \
-		${WRKSRC}/src/github.com/go-macaron/session
-	@${MV} ${WRKSRC_mysql} \
-		${WRKSRC}/src/github.com/go-sql-driver/mysql
-	@${MV} ${WRKSRC_stack} \
-		${WRKSRC}/src/github.com/go-stack/stack
-	@${MV} ${WRKSRC_core} \
-		${WRKSRC}/src/github.com/go-xorm/core
-	@${MV} ${WRKSRC_xorm} \
-		${WRKSRC}/src/github.com/go-xorm/xorm
-	@${MV} ${WRKSRC_websocket} \
-		${WRKSRC}/src/github.com/gorilla/websocket
-	@${MV} ${WRKSRC_slug} \
-		${WRKSRC}/src/github.com/gosimple/slug
-	@${MV} ${WRKSRC_go_version} \
-		${WRKSRC}/src/github.com/hashicorp/go-version
-	@${MV} ${WRKSRC_log15} \
-		${WRKSRC}/src/github.com/inconshreveable/log15
-	@${MV} ${WRKSRC_go_jmespath} \
-		${WRKSRC}/src/github.com/jmespath/go-jmespath
-	@${MV} ${WRKSRC_gls} \
-		${WRKSRC}/src/github.com/jtolds/gls
-	@${MV} ${WRKSRC_compress} \
-		${WRKSRC}/src/github.com/klauspost/compress
-	@${MV} ${WRKSRC_cpuid} \
-		${WRKSRC}/src/github.com/klauspost/cpuid
-	@${MV} ${WRKSRC_crc32} \
-		${WRKSRC}/src/github.com/klauspost/crc32
-	@${MV} ${WRKSRC_pretty} \
-		${WRKSRC}/src/github.com/kr/pretty
-	@${MV} ${WRKSRC_text} \
-		${WRKSRC}/src/github.com/kr/text
-	@${MV} ${WRKSRC_pq} \
-		${WRKSRC}/src/github.com/lib/pq
-	@${MV} ${WRKSRC_go_colorable} \
-		${WRKSRC}/src/github.com/mattn/go-colorable
-	@${MV} ${WRKSRC_go_isatty} \
-		${WRKSRC}/src/github.com/mattn/go-isatty
-	@${MV} ${WRKSRC_go_sqlite3} \
-		${WRKSRC}/src/github.com/mattn/go-sqlite3
-	@${MV} ${WRKSRC_unidecode} \
-		${WRKSRC}/src/github.com/rainycape/unidecode
-	@${MV} ${WRKSRC_goconvey} \
-		${WRKSRC}/src/github.com/smartystreets/goconvey
-	@${MV} ${WRKSRC_amqp} \
-		${WRKSRC}/src/github.com/streadway/amqp
-	@${MV} ${WRKSRC_net} \
-		${WRKSRC}/src/golang.org/x/net
-	@${MV} ${WRKSRC_oauth2} \
-		${WRKSRC}/src/golang.org/x/oauth2
-	@${MV} ${WRKSRC_sys} \
-		${WRKSRC}/src/golang.org/x/sys
-	@${MV} ${WRKSRC_asn1_ber} \
-		${WRKSRC}/src/gopkg.in/asn1-ber.v1
-	@${MV} ${WRKSRC_bufio} \
-		${WRKSRC}/src/gopkg.in/bufio.v1
-	@${MV} ${WRKSRC_ini} \
-		${WRKSRC}/src/gopkg.in/ini.v1
-	@${MV} ${WRKSRC_macaron} \
-		${WRKSRC}/src/gopkg.in/macaron.v1
-	@${MV} ${WRKSRC_redis} \
-		${WRKSRC}/src/gopkg.in/redis.v2
-
 	${RM} -r ${WRKSRC}/src/github.com/grafana/grafana/public
 	${MV} ${WRKSRC_grafana_public}/public ${WRKSRC}/src/github.com/grafana/grafana/public
 	${MV} ${WRKSRC_grafana_public}/public_gen ${WRKSRC}/src/github.com/grafana/grafana/public_gen