Convert a few ports to GH_TUPLE.

Sponsored by:	Absolight

1 files changed, 71 insertions, 184 deletions

diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index 7f4ce52d4cda..924494015873 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -20,73 +20,73 @@ USE_RC_SUBR=	telegraf
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	influxdata:DEFAULT
-GH_TUPLE=	Shopify:sarama:8aadb47:sarama \
-		Sirupsen:logrus:219c8cb:logrus \
-		aerospike:aerospike-client-go:7f3a312:aerospike_client_go \
-		amir:raidman:53c1b96:raidman \
-		aws:aws-sdk-go:13a1206:aws_sdk_go \
-		beorn7:perks:3ac7bf7:perks \
-		cenkalti:backoff:4dc7767:backoff \
-		couchbase:go-couchbase:cb66431:go_couchbase \
-		couchbase:gomemcached:a5ea635:gomemcached \
-		couchbase:goutils:5823a0c:goutils \
-		dancannon:gorethink:e7cac92:gorethink \
-		davecgh:go-spew:5215b55:go_spew \
-		docker:engine-api:8924d69:engine_api \
-		docker:go-connections:f549a93:go_connections \
-		docker:go-units:5d2041e:go_units \
-		eapache:go-resiliency:b86b1ec:go_resiliency \
-		eapache:queue:ded5959:queue \
-		eclipse:paho.mqtt.golang:0f7a459:paho_mqtt_golang \
-		go-sql-driver:mysql:1fca743:mysql \
-		gobwas:glob:49571a1:glob \
-		golang:protobuf:552c7b9:protobuf \
-		golang:snappy:d9eb7a3:snappy \
-		gonuts:go-shellquote:e842a11:go_shellquote \
-		gorilla:context:1ea2538:context \
-		gorilla:mux:c9e326e:mux \
-		hailocab:go-hostpool:e80d13c:go_hostpool \
-		hashicorp:consul:5aa9045:consul \
-		hpcloud:tail:b294095:tail \
-		influxdata:config:b79f682:config \
-		influxdata:influxdb:fc57c0f:influxdb \
-		influxdata:toml:af4df43:toml \
-		influxdata:wlog:7c63b0a:wlog \
-		kardianos:osext:29ae4ff:osext \
-		kardianos:service:5e33559:service \
-		klauspost:crc32:19b0b33:crc32 \
-		lib:pq:e182dc4:pq \
-		matttproud:golang_protobuf_extensions:d0c3fe8:golang_protobuf_extensions \
-		miekg:dns:cce6c13:dns \
-		mreiferson:go-snappystream:028eae7:go_snappystream \
-		naoina:go-stringutil:6b638e9:go_stringutil \
-		nats-io:go-nats:ea8b4fd:go_nats \
-		nats-io:nuid:a5152d6:nuid \
-		nsqio:go-nsq:0b80d6f:go_nsq \
-		opencontainers:runc:89ab7f2:runc \
-		prometheus:client_golang:18acf99:client_golang \
-		prometheus:client_model:fa8ad6f:client_model \
-		prometheus:common:e8eabff:common \
-		prometheus:procfs:406e5b7:procfs \
-		samuel:go-zookeeper:218e9c8:go_zookeeper \
-		shirou:gopsutil:4d0c402:gopsutil \
-		soniah:gosnmp:3fe3beb:gosnmp \
-		sparrc:gdm:66023a5:gdm \
-		streadway:amqp:b4f3cea:amqp \
-		stretchr:testify:1f4a164:testify \
-		vjeantet:grok:83bfdfd:grok \
-		wvanbergen:kafka:46f9a1c:kafka \
-		wvanbergen:kazoo-go:0f76871:kazoo_go \
-		yuin:gopher-lua:bf3808a:gopher_lua \
-		zensqlmonitor:go-mssqldb:ffe5510:go_mssqldb \
-		golang:crypto:c197bcf:crypto \
-		golang:net:6acef71:net \
-		golang:text:a71fd10:text \
-		golang:tools:fc2b74b:tools \
-		dancannon:gorethink:7d1af5b:gorethink_v1 \
-		fatih:pool:cba550e:pool_v2 \
-		go-mgo:mgo:d90005c:mgo \
-		go-yaml:yaml:a83829b:yaml
+GH_TUPLE=	Shopify:sarama:8aadb47:sarama/src/github.com/Shopify/sarama \
+		Sirupsen:logrus:219c8cb:logrus/src/github.com/Sirupsen/logrus \
+		aerospike:aerospike-client-go:7f3a312:aerospike_client_go/src/github.com/aerospike/aerospike-client-go \
+		amir:raidman:53c1b96:raidman/src/github.com/amir/raidman \
+		aws:aws-sdk-go:13a1206:aws_sdk_go/src/github.com/aws/aws-sdk-go \
+		beorn7:perks:3ac7bf7:perks/src/github.com/beorn7/perks \
+		cenkalti:backoff:4dc7767:backoff/src/github.com/cenkalti/backoff \
+		couchbase:go-couchbase:cb66431:go_couchbase/src/github.com/couchbase/go-couchbase \
+		couchbase:gomemcached:a5ea635:gomemcached/src/github.com/couchbase/gomemcached \
+		couchbase:goutils:5823a0c:goutils/src/github.com/couchbase/goutils \
+		dancannon:gorethink:e7cac92:gorethink/src/github.com/dancannon/gorethink \
+		davecgh:go-spew:5215b55:go_spew/src/github.com/davecgh/go-spew \
+		docker:engine-api:8924d69:engine_api/src/github.com/docker/engine-api \
+		docker:go-connections:f549a93:go_connections/src/github.com/docker/go-connections \
+		docker:go-units:5d2041e:go_units/src/github.com/docker/go-units \
+		eapache:go-resiliency:b86b1ec:go_resiliency/src/github.com/eapache/go-resiliency \
+		eapache:queue:ded5959:queue/src/github.com/eapache/queue \
+		eclipse:paho.mqtt.golang:0f7a459:paho_mqtt_golang/src/github.com/eclipse/paho.mqtt.golang \
+		go-sql-driver:mysql:1fca743:mysql/src/github.com/go-sql-driver/mysql \
+		gobwas:glob:49571a1:glob/src/github.com/gobwas/glob \
+		golang:protobuf:552c7b9:protobuf/src/github.com/golang/protobuf \
+		golang:snappy:d9eb7a3:snappy/src/github.com/golang/snappy \
+		gonuts:go-shellquote:e842a11:go_shellquote/src/github.com/gonuts/go-shellquote \
+		gorilla:context:1ea2538:context/src/github.com/gorilla/context \
+		gorilla:mux:c9e326e:mux/src/github.com/gorilla/mux \
+		hailocab:go-hostpool:e80d13c:go_hostpool/src/github.com/hailocab/go-hostpool \
+		hashicorp:consul:5aa9045:consul/src/github.com/hashicorp/consul \
+		hpcloud:tail:b294095:tail/src/github.com/hpcloud/tail \
+		influxdata:config:b79f682:config/src/github.com/influxdata/config \
+		influxdata:influxdb:fc57c0f:influxdb/src/github.com/influxdata/influxdb \
+		influxdata:toml:af4df43:toml/src/github.com/influxdata/toml \
+		influxdata:wlog:7c63b0a:wlog/src/github.com/influxdata/wlog \
+		kardianos:osext:29ae4ff:osext/src/github.com/kardianos/osext \
+		kardianos:service:5e33559:service/src/github.com/kardianos/service \
+		klauspost:crc32:19b0b33:crc32/src/github.com/klauspost/crc32 \
+		lib:pq:e182dc4:pq/src/github.com/lib/pq \
+		matttproud:golang_protobuf_extensions:d0c3fe8:golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions \
+		miekg:dns:cce6c13:dns/src/github.com/miekg/dns \
+		mreiferson:go-snappystream:028eae7:go_snappystream/src/github.com/mreiferson/go-snappystream \
+		naoina:go-stringutil:6b638e9:go_stringutil/src/github.com/naoina/go-stringutil \
+		nats-io:go-nats:ea8b4fd:go_nats/src/github.com/nats-io/nats \
+		nats-io:nuid:a5152d6:nuid/src/github.com/nats-io/nuid \
+		nsqio:go-nsq:0b80d6f:go_nsq/src/github.com/nsqio/go-nsq \
+		opencontainers:runc:89ab7f2:runc/src/github.com/opencontainers/runc \
+		prometheus:client_golang:18acf99:client_golang/src/github.com/prometheus/client_golang \
+		prometheus:client_model:fa8ad6f:client_model/src/github.com/prometheus/client_model \
+		prometheus:common:e8eabff:common/src/github.com/prometheus/common \
+		prometheus:procfs:406e5b7:procfs/src/github.com/prometheus/procfs \
+		samuel:go-zookeeper:218e9c8:go_zookeeper/src/github.com/samuel/go-zookeeper \
+		shirou:gopsutil:4d0c402:gopsutil/src/github.com/shirou/gopsutil \
+		soniah:gosnmp:3fe3beb:gosnmp/src/github.com/soniah/gosnmp \
+		sparrc:gdm:66023a5:gdm/src/github.com/sparrc/gdm \
+		streadway:amqp:b4f3cea:amqp/src/github.com/streadway/amqp \
+		stretchr:testify:1f4a164:testify/src/github.com/stretchr/testify \
+		vjeantet:grok:83bfdfd:grok/src/github.com/vjeantet/grok \
+		wvanbergen:kafka:46f9a1c:kafka/src/github.com/wvanbergen/kafka \
+		wvanbergen:kazoo-go:0f76871:kazoo_go/src/github.com/wvanbergen/kazoo-go \
+		yuin:gopher-lua:bf3808a:gopher_lua/src/github.com/yuin/gopher-lua \
+		zensqlmonitor:go-mssqldb:ffe5510:go_mssqldb/src/github.com/zensqlmonitor/go-mssqldb \
+		golang:crypto:c197bcf:crypto/src/golang.org/x/crypto \
+		golang:net:6acef71:net/src/golang.org/x/net \
+		golang:text:a71fd10:text/src/golang.org/x/text \
+		golang:tools:fc2b74b:tools/src/golang.org/x/tools \
+		dancannon:gorethink:7d1af5b:gorethink_v1/src/gopkg.in/dancannon/gorethink.v1 \
+		fatih:pool:cba550e:pool_v2/src/gopkg.in/fatih/pool.v2 \
+		go-mgo:mgo:d90005c:mgo/src/gopkg.in/mgo.v2 \
+		go-yaml:yaml:a83829b:yaml/src/gopkg.in/yaml.v2
 
 SUB_FILES=	telegraf
 SUB_LIST+=	TELEGRAF_PIDDIR=${TELEGRAF_PIDDIR}
@@ -95,124 +95,11 @@ PLIST_SUB=	TELEGRAF_PIDDIR=${TELEGRAF_PIDDIR}
 STRIP=		# stripping can break go binaries
 
 post-patch:
-	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} \
-	${WRKSRC}/src/github.com/Shopify \
-	${WRKSRC}/src/github.com/Sirupsen \
-	${WRKSRC}/src/github.com/aerospike \
-	${WRKSRC}/src/github.com/amir \
-	${WRKSRC}/src/github.com/aws \
-	${WRKSRC}/src/github.com/beorn7 \
-	${WRKSRC}/src/github.com/cenkalti \
-	${WRKSRC}/src/github.com/couchbase \
-	${WRKSRC}/src/github.com/dancannon \
-	${WRKSRC}/src/github.com/davecgh \
-	${WRKSRC}/src/github.com/docker \
-	${WRKSRC}/src/github.com/eapache \
-	${WRKSRC}/src/github.com/eclipse \
-	${WRKSRC}/src/github.com/go-sql-driver \
-	${WRKSRC}/src/github.com/gobwas \
-	${WRKSRC}/src/github.com/golang \
-	${WRKSRC}/src/github.com/gonuts \
-	${WRKSRC}/src/github.com/gorilla \
-	${WRKSRC}/src/github.com/hailocab \
-	${WRKSRC}/src/github.com/hashicorp \
-	${WRKSRC}/src/github.com/hpcloud \
-	${WRKSRC}/src/github.com/influxdata \
-	${WRKSRC}/src/github.com/kardianos \
-	${WRKSRC}/src/github.com/klauspost \
-	${WRKSRC}/src/github.com/lib \
-	${WRKSRC}/src/github.com/matttproud \
-	${WRKSRC}/src/github.com/miekg \
-	${WRKSRC}/src/github.com/mreiferson \
-	${WRKSRC}/src/github.com/naoina \
-	${WRKSRC}/src/github.com/nats-io \
-	${WRKSRC}/src/github.com/nsqio \
-	${WRKSRC}/src/github.com/opencontainers \
-	${WRKSRC}/src/github.com/prometheus \
-	${WRKSRC}/src/github.com/samuel \
-	${WRKSRC}/src/github.com/shirou \
-	${WRKSRC}/src/github.com/soniah \
-	${WRKSRC}/src/github.com/sparrc \
-	${WRKSRC}/src/github.com/streadway \
-	${WRKSRC}/src/github.com/stretchr \
-	${WRKSRC}/src/github.com/vjeantet \
-	${WRKSRC}/src/github.com/wvanbergen \
-	${WRKSRC}/src/github.com/yuin \
-	${WRKSRC}/src/github.com/zensqlmonitor \
-	${WRKSRC}/src/golang.org/x \
-	${WRKSRC}/src/gopkg.in/dancannon \
-	${WRKSRC}/src/gopkg.in/fatih
-	cd ${WRKSRC} && ${MV} CHANGELOG.md CONTRIBUTING.md Godeps Godeps_windows \
+	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
+	@cd ${WRKSRC} && ${MV} CHANGELOG.md CONTRIBUTING.md Godeps Godeps_windows \
 		LICENSE Makefile README.md accumulator.go agent aggregator.go circle.yml cmd docs etc filter \
 		input.go internal logger metric.go metric_test.go output.go plugins processor.go scripts testutil \
-		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
-	${MV} ${WRKSRC_sarama} ${WRKSRC}/src/github.com/Shopify/sarama ;\
-	${MV} ${WRKSRC_logrus} ${WRKSRC}/src/github.com/Sirupsen/logrus ;\
-	${MV} ${WRKSRC_aerospike_client_go} ${WRKSRC}/src/github.com/aerospike/aerospike-client-go ;\
-	${MV} ${WRKSRC_raidman} ${WRKSRC}/src/github.com/amir/raidman ;\
-	${MV} ${WRKSRC_aws_sdk_go} ${WRKSRC}/src/github.com/aws/aws-sdk-go ;\
-	${MV} ${WRKSRC_perks} ${WRKSRC}/src/github.com/beorn7/perks ;\
-	${MV} ${WRKSRC_backoff} ${WRKSRC}/src/github.com/cenkalti/backoff ;\
-	${MV} ${WRKSRC_go_couchbase} ${WRKSRC}/src/github.com/couchbase/go-couchbase ;\
-	${MV} ${WRKSRC_gomemcached} ${WRKSRC}/src/github.com/couchbase/gomemcached ;\
-	${MV} ${WRKSRC_goutils} ${WRKSRC}/src/github.com/couchbase/goutils ;\
-	${MV} ${WRKSRC_gorethink} ${WRKSRC}/src/github.com/dancannon/gorethink ;\
-	${MV} ${WRKSRC_go_spew} ${WRKSRC}/src/github.com/davecgh/go-spew ;\
-	${MV} ${WRKSRC_engine_api} ${WRKSRC}/src/github.com/docker/engine-api ;\
-	${MV} ${WRKSRC_go_connections} ${WRKSRC}/src/github.com/docker/go-connections ;\
-	${MV} ${WRKSRC_go_units} ${WRKSRC}/src/github.com/docker/go-units ;\
-	${MV} ${WRKSRC_go_resiliency} ${WRKSRC}/src/github.com/eapache/go-resiliency ;\
-	${MV} ${WRKSRC_queue} ${WRKSRC}/src/github.com/eapache/queue ;\
-	${MV} ${WRKSRC_paho_mqtt_golang} ${WRKSRC}/src/github.com/eclipse/paho.mqtt.golang ;\
-	${MV} ${WRKSRC_mysql} ${WRKSRC}/src/github.com/go-sql-driver/mysql ;\
-	${MV} ${WRKSRC_glob} ${WRKSRC}/src/github.com/gobwas/glob ;\
-	${MV} ${WRKSRC_protobuf} ${WRKSRC}/src/github.com/golang/protobuf ;\
-	${MV} ${WRKSRC_snappy} ${WRKSRC}/src/github.com/golang/snappy ;\
-	${MV} ${WRKSRC_go_shellquote} ${WRKSRC}/src/github.com/gonuts/go-shellquote ;\
-	${MV} ${WRKSRC_context} ${WRKSRC}/src/github.com/gorilla/context ;\
-	${MV} ${WRKSRC_mux} ${WRKSRC}/src/github.com/gorilla/mux ;\
-	${MV} ${WRKSRC_go_hostpool} ${WRKSRC}/src/github.com/hailocab/go-hostpool ;\
-	${MV} ${WRKSRC_consul} ${WRKSRC}/src/github.com/hashicorp/consul ;\
-	${MV} ${WRKSRC_tail} ${WRKSRC}/src/github.com/hpcloud/tail ;\
-	${MV} ${WRKSRC_config} ${WRKSRC}/src/github.com/influxdata/config ;\
-	${MV} ${WRKSRC_influxdb} ${WRKSRC}/src/github.com/influxdata/influxdb ;\
-	${MV} ${WRKSRC_toml} ${WRKSRC}/src/github.com/influxdata/toml ;\
-	${MV} ${WRKSRC_wlog} ${WRKSRC}/src/github.com/influxdata/wlog ;\
-	${MV} ${WRKSRC_osext} ${WRKSRC}/src/github.com/kardianos/osext ;\
-	${MV} ${WRKSRC_service} ${WRKSRC}/src/github.com/kardianos/service ;\
-	${MV} ${WRKSRC_crc32} ${WRKSRC}/src/github.com/klauspost/crc32 ;\
-	${MV} ${WRKSRC_pq} ${WRKSRC}/src/github.com/lib/pq ;\
-	${MV} ${WRKSRC_golang_protobuf_extensions} ${WRKSRC}/src/github.com/matttproud/golang_protobuf_extensions ;\
-	${MV} ${WRKSRC_dns} ${WRKSRC}/src/github.com/miekg/dns ;\
-	${MV} ${WRKSRC_go_snappystream} ${WRKSRC}/src/github.com/mreiferson/go-snappystream ;\
-	${MV} ${WRKSRC_go_stringutil} ${WRKSRC}/src/github.com/naoina/go-stringutil ;\
-	${MV} ${WRKSRC_go_nats} ${WRKSRC}/src/github.com/nats-io/nats ;\
-	${MV} ${WRKSRC_nuid} ${WRKSRC}/src/github.com/nats-io/nuid ;\
-	${MV} ${WRKSRC_go_nsq} ${WRKSRC}/src/github.com/nsqio/go-nsq ;\
-	${MV} ${WRKSRC_runc} ${WRKSRC}/src/github.com/opencontainers/runc ;\
-	${MV} ${WRKSRC_client_golang} ${WRKSRC}/src/github.com/prometheus/client_golang ;\
-	${MV} ${WRKSRC_client_model} ${WRKSRC}/src/github.com/prometheus/client_model ;\
-	${MV} ${WRKSRC_common} ${WRKSRC}/src/github.com/prometheus/common ;\
-	${MV} ${WRKSRC_procfs} ${WRKSRC}/src/github.com/prometheus/procfs ;\
-	${MV} ${WRKSRC_go_zookeeper} ${WRKSRC}/src/github.com/samuel/go-zookeeper ;\
-	${MV} ${WRKSRC_gopsutil} ${WRKSRC}/src/github.com/shirou/gopsutil ;\
-	${MV} ${WRKSRC_gosnmp} ${WRKSRC}/src/github.com/soniah/gosnmp ;\
-	${MV} ${WRKSRC_gdm} ${WRKSRC}/src/github.com/sparrc/gdm ;\
-	${MV} ${WRKSRC_amqp} ${WRKSRC}/src/github.com/streadway/amqp ;\
-	${MV} ${WRKSRC_testify} ${WRKSRC}/src/github.com/stretchr/testify ;\
-	${MV} ${WRKSRC_grok} ${WRKSRC}/src/github.com/vjeantet/grok ;\
-	${MV} ${WRKSRC_kafka} ${WRKSRC}/src/github.com/wvanbergen/kafka ;\
-	${MV} ${WRKSRC_kazoo_go} ${WRKSRC}/src/github.com/wvanbergen/kazoo-go ;\
-	${MV} ${WRKSRC_gopher_lua} ${WRKSRC}/src/github.com/yuin/gopher-lua ;\
-	${MV} ${WRKSRC_go_mssqldb} ${WRKSRC}/src/github.com/zensqlmonitor/go-mssqldb ;\
-	${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto ;\
-	${MV} ${WRKSRC_net} ${WRKSRC}/src/golang.org/x/net ;\
-	${MV} ${WRKSRC_text} ${WRKSRC}/src/golang.org/x/text ;\
-	${MV} ${WRKSRC_tools} ${WRKSRC}/src/golang.org/x/tools ;\
-	${MV} ${WRKSRC_gorethink_v1} ${WRKSRC}/src/gopkg.in/dancannon/gorethink.v1 ;\
-	${MV} ${WRKSRC_pool_v2} ${WRKSRC}/src/gopkg.in/fatih/pool.v2 ;\
-	${MV} ${WRKSRC_mgo} ${WRKSRC}/src/gopkg.in/mgo.v2 ;\
-	${MV} ${WRKSRC_yaml} ${WRKSRC}/src/gopkg.in/yaml.v2
+		${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 
 do-build:
 	@cd ${WRKSRC}/src/github.com/influxdata/${PORTNAME} && \
@@ -221,7 +108,7 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} \
-		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/etc/${PORTNAME}.conf  \
+		${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT}/etc/${PORTNAME}.conf  \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
 .include <bsd.port.mk>