Date: Tue, 13 Dec 2016 14:58:08 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428493 - in head: databases/influxdb net-mgmt/telegraf net/rclone sysutils/envconsul www/gohugo www/grafana2 Message-ID: <201612131458.uBDEw8Kb069211@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Dec 13 14:58:08 2016 New Revision: 428493 URL: https://svnweb.freebsd.org/changeset/ports/428493 Log: Convert a few ports to GH_TUPLE. Sponsored by: Absolight Modified: head/databases/influxdb/Makefile (contents, props changed) head/net-mgmt/telegraf/Makefile (contents, props changed) head/net/rclone/Makefile (contents, props changed) head/sysutils/envconsul/Makefile (contents, props changed) head/www/gohugo/Makefile (contents, props changed) head/www/grafana2/Makefile (contents, props changed) Modified: head/databases/influxdb/Makefile ============================================================================== --- head/databases/influxdb/Makefile Tue Dec 13 14:57:04 2016 (r428492) +++ head/databases/influxdb/Makefile Tue Dec 13 14:58:08 2016 (r428493) @@ -18,24 +18,24 @@ USE_RC_SUBR= influxd USE_GITHUB= yes GH_ACCOUNT= influxdata:DEFAULT -GH_TUPLE= BurntSushi:toml:9906417:toml \ - bmizerany:pat:c068ca2:pat \ - boltdb:bolt:5cc10bb:bolt \ - davecgh:go-spew:5215b55:go_spew \ - dgrijalva:jwt-go:63734ea:jwt_go \ - dgryski:go-bits:2ad8d70:go_bits \ - dgryski:go-bitstream:7d46cd2:go_bitstream \ - gogo:protobuf:0394392:protobuf \ - golang:snappy:d9eb7a3:snappy \ - influxdata:usage-client:6d38953:usage_client \ - jwilder:encoding:4dada27:encoding \ - kimor79:gollectd:61d0dee:gollectd \ - paulbellamy:ratecounter:5a11f58:ratecounter \ - peterh:liner:8975875:liner \ - rakyll:statik:274df12:statik \ - retailnext:hllpp:38a7bb7:hllpp \ - collectd:go-collectd:9fc824c:go_collectd \ - golang:crypto:c197bcf:crypto +GH_TUPLE= BurntSushi:toml:9906417:toml/src/github.com/BurntSushi/toml \ + bmizerany:pat:c068ca2:pat/src/github.com/bmizerany/pat \ + boltdb:bolt:5cc10bb:bolt/src/github.com/boltdb/bolt \ + davecgh:go-spew:5215b55:go_spew/src/github.com/davecgh/go-spew \ + dgrijalva:jwt-go:63734ea:jwt_go/src/github.com/dgrijalva/jwt-go \ + dgryski:go-bits:2ad8d70:go_bits/src/github.com/dgryski/go-bits \ + dgryski:go-bitstream:7d46cd2:go_bitstream/src/github.com/dgryski/go-bitstream \ + gogo:protobuf:0394392:protobuf/src/github.com/gogo/protobuf \ + golang:snappy:d9eb7a3:snappy/src/github.com/golang/snappy \ + influxdata:usage-client:6d38953:usage_client/src/github.com/influxdata/usage-client \ + jwilder:encoding:4dada27:encoding/src/github.com/jwilder/encoding \ + kimor79:gollectd:61d0dee:gollectd/src/github.com/kimor79/gollectd \ + paulbellamy:ratecounter:5a11f58:ratecounter/src/github.com/paulbellamy/ratecounter \ + peterh:liner:8975875:liner/src/github.com/peterh/liner \ + rakyll:statik:274df12:statik/src/github.com/rakyll/statik \ + retailnext:hllpp:38a7bb7:hllpp/src/github.com/retailnext/hllpp \ + collectd:go-collectd:9fc824c:go_collectd/src/collectd.org \ + golang:crypto:c197bcf:crypto/src/golang.org/x/crypto SUB_FILES= influxd SUB_LIST+= INFLUXD_USER=${INFLUXD_USER} \ @@ -63,25 +63,7 @@ GROUPS= ${INFLUXD_GROUP} STRIP= # stripping can break go binaries post-patch: - @${MKDIR} ${WRKSRC}/src/github.com/BurntSushi - @${MKDIR} ${WRKSRC}/src/github.com/bmizerany - @${MKDIR} ${WRKSRC}/src/github.com/boltdb - @${MKDIR} ${WRKSRC}/src/github.com/davecgh - @${MKDIR} ${WRKSRC}/src/github.com/dgrijalva - @${MKDIR} ${WRKSRC}/src/github.com/dgryski - @${MKDIR} ${WRKSRC}/src/github.com/gogo - @${MKDIR} ${WRKSRC}/src/github.com/golang - @${MKDIR} ${WRKSRC}/src/github.com/hashicorp - @${MKDIR} ${WRKSRC}/src/github.com/influxdata - @${MKDIR} ${WRKSRC}/src/github.com/jwilder - @${MKDIR} ${WRKSRC}/src/github.com/kimor79 - @${MKDIR} ${WRKSRC}/src/github.com/paulbellamy - @${MKDIR} ${WRKSRC}/src/github.com/peterh - @${MKDIR} ${WRKSRC}/src/github.com/rakyll - @${MKDIR} ${WRKSRC}/src/github.com/retailnext - @${MKDIR} ${WRKSRC}/src/golang.org/x - @${MKDIR} ${WRKSRC}/src/gopkg.in/fatih - @${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} + @${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} @cd ${WRKSRC} && \ ${MV} LICENSE build.sh gobuild.sh node.go tests \ circle-test.sh importer package.sh toml \ @@ -91,28 +73,10 @@ post-patch: .mention-bot Dockerfile_build_ubuntu64_git appveyor.yml coordinator models stress \ Dockerfile_test_ubuntu32 build-docker.sh errors.go monitor tcp \ Godeps build.py etc nightly.sh test.sh \ - ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} - @${MV} ${WRKSRC_toml} ${WRKSRC}/src/github.com/BurntSushi/toml - @${MV} ${WRKSRC_pat} ${WRKSRC}/src/github.com/bmizerany/pat - @${MV} ${WRKSRC_bolt} ${WRKSRC}/src/github.com/boltdb/bolt - @${MV} ${WRKSRC_go_spew} ${WRKSRC}/src/github.com/davecgh/go-spew - @${MV} ${WRKSRC_jwt_go} ${WRKSRC}/src/github.com/dgrijalva/jwt-go - @${MV} ${WRKSRC_go_bits} ${WRKSRC}/src/github.com/dgryski/go-bits - @${MV} ${WRKSRC_go_bitstream} ${WRKSRC}/src/github.com/dgryski/go-bitstream - @${MV} ${WRKSRC_protobuf} ${WRKSRC}/src/github.com/gogo/protobuf - @${MV} ${WRKSRC_snappy} ${WRKSRC}/src/github.com/golang/snappy - @${MV} ${WRKSRC_usage_client} ${WRKSRC}/src/github.com/influxdata/usage-client - @${MV} ${WRKSRC_encoding} ${WRKSRC}/src/github.com/jwilder/encoding - @${MV} ${WRKSRC_gollectd} ${WRKSRC}/src/github.com/kimor79/gollectd - @${MV} ${WRKSRC_ratecounter} ${WRKSRC}/src/github.com/paulbellamy/ratecounter - @${MV} ${WRKSRC_liner} ${WRKSRC}/src/github.com/peterh/liner - @${MV} ${WRKSRC_statik} ${WRKSRC}/src/github.com/rakyll/statik - @${MV} ${WRKSRC_hllpp} ${WRKSRC}/src/github.com/retailnext/hllpp - @${MV} ${WRKSRC_go_collectd} ${WRKSRC}/src/collectd.org - @${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto + ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} do-build: - @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} && \ + @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT} && \ ${SETENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./... do-install: @@ -125,9 +89,9 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/influx_tsm ${STAGEDIR}${PREFIX}/bin/influx_tsm @${SED} -i .bak -e \ "s|/tmp/influxdb/development|/var/db/influxdb|g" \ - ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/etc/config.sample.toml + ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT}/etc/config.sample.toml ${INSTALL_DATA} \ - ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/etc/config.sample.toml \ + ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT}/etc/config.sample.toml \ ${STAGEDIR}${PREFIX}/etc/influxd.conf.sample @${MKDIR} ${STAGEDIR}/var/db/influxdb @${MKDIR} ${STAGEDIR}/var/log/influxdb Modified: head/net-mgmt/telegraf/Makefile ============================================================================== --- head/net-mgmt/telegraf/Makefile Tue Dec 13 14:57:04 2016 (r428492) +++ head/net-mgmt/telegraf/Makefile Tue Dec 13 14:58:08 2016 (r428493) @@ -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_PI 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> Modified: head/net/rclone/Makefile ============================================================================== --- head/net/rclone/Makefile Tue Dec 13 14:57:04 2016 (r428492) +++ head/net/rclone/Makefile Tue Dec 13 14:58:08 2016 (r428493) @@ -12,87 +12,41 @@ LICENSE= MIT USES= go USE_GITHUB= yes +GH_ACCOUNT= ncw +GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} GH_TUPLE+= \ - ncw:rclone:${DISTVERSIONFULL} \ - ncw:go-acd:56da839:goacd \ - ncw:swift:b964f2c:swift \ - aws:aws-sdk-go:87a2cff:awssdkgo \ - mreiferson:go-httpclient:31f0106:gohttpclient \ - google:go-querystring:9235644:goquerystring \ - GoogleCloudPlatform:google-cloud-go:80a7732:gcloudgolang \ - google:google-api-go-client:0caa379:googleapigoclient \ - golang:oauth2:3c3a985:oauth2 \ - golang:net:6d3beae:net \ - golang:text:a7c0236:text \ - skratchdot:open-golang:75fb7ed:opengolang \ - stacktic:dropbox:58f839b:dropbox \ - tsenart:tb:19f4c3d:tb \ - VividCortex:ewma:c595cd8:ewma \ - golang:crypto:8e06e8d:crypto \ - pkg:errors:a887431:errors \ - bazil:fuse:371fbbd:fuse \ - spf13:cobra:9c28e4b:cobra \ - spf13:pflag:c7e63cf:pflag \ - rfjakob:eme:601d0e2:eme \ - ogier:pflag:45c278a:opflag \ - Unknwon:goconfig:5aa4f8c:goconfig \ - cpuguy83:go-md2man:a65d4d2:gomd2man + google:google-api-go-client:0caa379:googleapigoclient/src/google.golang.org/api \ + ncw:go-acd:56da839:goacd/src/github.com/ncw/go-acd \ + ncw:swift:b964f2c:swift/src/github.com/ncw/swift \ + aws:aws-sdk-go:87a2cff:awssdkgo/src/github.com/aws/aws-sdk-go \ + mreiferson:go-httpclient:31f0106:gohttpclient/src/github.com/mreiferson/go-httpclient \ + google:go-querystring:9235644:goquerystring/src/github.com/google/go-querystring \ + GoogleCloudPlatform:google-cloud-go:80a7732:gcloudgolang/src/cloud.google.com/go \ + golang:oauth2:3c3a985:oauth2/src/golang.org/x/oauth2 \ + golang:net:6d3beae:net/src/golang.org/x/net \ + golang:text:a7c0236:text/src/golang.org/x/text \ + skratchdot:open-golang:75fb7ed:opengolang/src/github.com/skratchdot/open-golang \ + stacktic:dropbox:58f839b:dropbox/src/github.com/stacktic/dropbox \ + tsenart:tb:19f4c3d:tb/src/github.com/tsenart/tb \ + VividCortex:ewma:c595cd8:ewma/src/github.com/VividCortex/ewma \ + golang:crypto:8e06e8d:crypto/src/golang.org/x/crypto \ + pkg:errors:a887431:errors/src/github.com/pkg/errors \ + bazil:fuse:371fbbd:fuse/src/bazil.org/fuse \ + spf13:cobra:9c28e4b:cobra/src/github.com/spf13/cobra \ + spf13:pflag:c7e63cf:pflag/src/github.com/spf13/pflag \ + rfjakob:eme:601d0e2:eme/src/github.com/rfjakob/eme \ + ogier:pflag:45c278a:opflag/src/github.com/ogier/pflag \ + Unknwon:goconfig:5aa4f8c:goconfig/src/github.com/Unknwon/goconfig \ + cpuguy83:go-md2man:a65d4d2:gomd2man/src/github.com/cpuguy83/go-md2man PLIST_FILES= bin/rclone STRIP= # stripping can break go binaries -post-extract: - @${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} -.for src in amazonclouddrive b2 cmd crypt dircache docs drive dropbox fs fstest googlecloudstorage graphics hubic local oauthutil onedrive pacer rest s3 swift yandex CONTRIBUTING.md COPYING README.md appveyor.yml rclone.go - @${MV} ${WRKSRC}/${src} \ - ${WRKSRC}/src/github.com/ncw/${PORTNAME} -.endfor - @${MKDIR} ${WRKSRC}/src/bazil.org - @${MKDIR} ${WRKSRC}/src/github.com/Unknwon - @${MKDIR} ${WRKSRC}/src/github.com/cpuguy83 - @${MKDIR} ${WRKSRC}/src/github.com/ogier - @${MKDIR} ${WRKSRC}/src/github.com/rfjakob - @${MKDIR} ${WRKSRC}/src/github.com/spf13 - @${MKDIR} ${WRKSRC}/src/github.com/stacktic - @${MKDIR} ${WRKSRC}/src/github.com/tsenart - @${MKDIR} ${WRKSRC}/src/github.com/VividCortex - @${MKDIR} ${WRKSRC}/src/github.com/aws - @${MKDIR} ${WRKSRC}/src/github.com/mreiferson - @${MKDIR} ${WRKSRC}/src/github.com/skratchdot - @${MKDIR} ${WRKSRC}/src/github.com/google - @${MKDIR} ${WRKSRC}/src/github.com/pkg - @${MKDIR} ${WRKSRC}/src/golang.org/x - @${MKDIR} ${WRKSRC}/src/cloud.google.com - @${MKDIR} ${WRKSRC}/src/google.golang.org - @${MV} ${WRKSRC_fuse} ${WRKSRC}/src/bazil.org/fuse - @${MV} ${WRKSRC_swift} ${WRKSRC}/src/github.com/ncw/swift - @${MV} ${WRKSRC_goacd} ${WRKSRC}/src/github.com/ncw/go-acd - @${MV} ${WRKSRC_goconfig} ${WRKSRC}/src/github.com/Unknwon/goconfig - @${MV} ${WRKSRC_gomd2man} ${WRKSRC}/src/github.com/cpuguy83/go-md2man - @${MV} ${WRKSRC_opflag} ${WRKSRC}/src/github.com/ogier/pflag - @${MV} ${WRKSRC_eme} ${WRKSRC}/src/github.com/rfjakob/eme - @${MV} ${WRKSRC_cobra} ${WRKSRC}/src/github.com/spf13/cobra - @${MV} ${WRKSRC_pflag} ${WRKSRC}/src/github.com/spf13/pflag - @${MV} ${WRKSRC_dropbox} ${WRKSRC}/src/github.com/stacktic/dropbox - @${MV} ${WRKSRC_tb} ${WRKSRC}/src/github.com/tsenart/tb - @${MV} ${WRKSRC_ewma} ${WRKSRC}/src/github.com/VividCortex/ewma - @${MV} ${WRKSRC_awssdkgo} ${WRKSRC}/src/github.com/aws/aws-sdk-go - @${MV} ${WRKSRC_gohttpclient} ${WRKSRC}/src/github.com/mreiferson/go-httpclient - @${MV} ${WRKSRC_opengolang} ${WRKSRC}/src/github.com/skratchdot/open-golang - @${MV} ${WRKSRC_goquerystring} ${WRKSRC}/src/github.com/google/go-querystring - @${MV} ${WRKSRC_errors} ${WRKSRC}/src/github.com/pkg/errors - @${MV} ${WRKSRC_oauth2} ${WRKSRC}/src/golang.org/x/oauth2 - @${MV} ${WRKSRC_googleapigoclient} ${WRKSRC}/src/google.golang.org/api - @${MV} ${WRKSRC_gcloudgolang} ${WRKSRC}/src/cloud.google.com/go - @${MV} ${WRKSRC_net} ${WRKSRC}/src/golang.org/x/net - @${MV} ${WRKSRC_text} ${WRKSRC}/src/golang.org/x/text - @${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto - do-build: - @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; ${SETENV} GOPATH=${WRKSRC} go build . + @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}; ${SETENV} GOPATH=${WRKSRC} go build . do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include <bsd.port.mk> Modified: head/sysutils/envconsul/Makefile ============================================================================== --- head/sysutils/envconsul/Makefile Tue Dec 13 14:57:04 2016 (r428492) +++ head/sysutils/envconsul/Makefile Tue Dec 13 14:58:08 2016 (r428493) @@ -14,33 +14,39 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go USE_GITHUB= yes -GH_ACCOUNT= armon:gometrics,goradix aws:awssdkgo coreos:etcd fatih:structs \ - go-ini:ini go-sql-driver:mysql hashicorp:DEFAULT,consul,consultemplate \ - hashicorp:errwrap,gocleanhttp,gogatedio,gomsgpack \ - hashicorp:gomultierror,gosyslog,gouuid,golanglru,hcl,logutils \ - hashicorp:serf,vault jmespath:gojmespath lib:pq \ - mitchellh:copystructure,iochan,mapstructure,reflectwalk \ - samuel:gozookeeper golang:crypto,net -GH_PROJECT= go-metrics:gometrics go-radix:goradix aws-sdk-go:awssdkgo \ - etcd:etcd structs:structs ini:ini mysql:mysql consul:consul \ - consul-template:consultemplate errwrap:errwrap \ - go-cleanhttp:gocleanhttp go-gatedio:gogatedio \ - go-msgpack:gomsgpack go-multierror:gomultierror \ - go-syslog:gosyslog go-uuid:gouuid golang-lru:golanglru hcl:hcl \ - logutils:logutils serf:serf vault:vault go-jmespath:gojmespath \ - pq:pq copystructure:copystructure iochan:iochan \ - mapstructure:mapstructure reflectwalk:reflectwalk \ - go-zookeeper:gozookeeper crypto:crypto net:net -GH_TAGNAME= 6c5fa0d:gometrics fbd82e8:goradix 308eaa6:awssdkgo 6afd8e4:etcd \ - a9f7daa:structs aea5e9f:ini 527bcd5:mysql 809ed36:consul \ - ec11b92:consultemplate c2a1a65:envconsul 7554cd9:errwrap \ - 875fb67:gocleanhttp 8b8de10:gogatedio fa3f638:gomsgpack \ - d30f099:gomultierror 42a2b57:gosyslog 2951e8b:gouuid \ - 17e3543:golanglru 4de5195:hcl 0dc08b1:logutils 8d36400:serf \ - 97820e2:vault bbaa094:gojmespath ffe986a:pq \ - 6fc6626:copystructure 87b45ff:iochan 281073e:mapstructure \ - eecf4c7:reflectwalk 913027e:gozookeeper c8b9e63:crypto \ - 271cfc1:net +GH_ACCOUNT= hashicorp +GH_TUPLE= \ + armon:go-metrics:6c5fa0d:gometrics/src/github.com/armon/go-metrics \ + armon:go-radix:fbd82e8:goradix/src/github.com/armon/go-radix \ + aws:aws-sdk-go:308eaa6:awssdkgo/src/github.com/aws/aws-sdk-go \ + coreos:etcd:6afd8e4:etcd/src/github.com/coreos/etcd \ + fatih:structs:a9f7daa:structs/src/github.com/fatih/structs \ + go-ini:ini:aea5e9f:ini/src/github.com/go-ini/ini \ + go-sql-driver:mysql:527bcd5:mysql/src/github.com/go-sql-driver/mysql \ + hashicorp:consul:809ed36:consul/src/github.com/hashicorp/consul \ + hashicorp:consul-template:ec11b92:consultemplate/src/github.com/hashicorp/consul-template \ + hashicorp:errwrap:7554cd9:errwrap/src/github.com/hashicorp/errwrap \ + hashicorp:go-cleanhttp:875fb67:gocleanhttp/src/github.com/hashicorp/go-cleanhttp \ + hashicorp:go-gatedio:8b8de10:gogatedio/src/github.com/hashicorp/go-gatedio \ + hashicorp:go-msgpack:fa3f638:gomsgpack/src/github.com/hashicorp/go-msgpack \ + hashicorp:go-multierror:d30f099:gomultierror/src/github.com/hashicorp/go-multierror \ + hashicorp:go-syslog:42a2b57:gosyslog/src/github.com/hashicorp/go-syslog \ + hashicorp:go-uuid:2951e8b:gouuid/src/github.com/hashicorp/go-uuid \ + hashicorp:golang-lru:17e3543:golanglru/src/github.com/hashicorp/golang-lru \ + hashicorp:hcl:4de5195:hcl/src/github.com/hashicorp/hcl \ + hashicorp:logutils:0dc08b1:logutils/src/github.com/hashicorp/logutils \ + hashicorp:serf:8d36400:serf/src/github.com/hashicorp/serf \ + hashicorp:vault:97820e2:vault/src/github.com/hashicorp/vault \ + jmespath:go-jmespath:bbaa094:gojmespath/src/github.com/jmespath/go-jmespath \ + lib:pq:ffe986a:pq/src/github.com/lib/pq \ + mitchellh:copystructure:6fc6626:copystructure/src/github.com/mitchellh/copystructure \ + mitchellh:iochan:87b45ff:iochan/src/github.com/mitchellh/iochan \ + mitchellh:mapstructure:281073e:mapstructure/src/github.com/mitchellh/mapstructure \ + mitchellh:reflectwalk:eecf4c7:reflectwalk/src/github.com/mitchellh/reflectwalk \ + samuel:go-zookeeper:913027e:gozookeeper/src/github.com/samuel/go-zookeeper \ + golang:crypto:c8b9e63:crypto/src/golang.org/x/crypto \ + golang:net:271cfc1:net/src/golang.org/x/net \ + hashicorp:envconsul:c2a1a65:envconsul PLIST_FILES= bin/envconsul @@ -58,47 +64,6 @@ post-patch: @${MV} ${WRKSRC}/${src} \ ${WRKSRC}/src/github.com/hashicorp/envconsul .endfor - @${MKDIR} ${WRKSRC}/src/github.com/armon - @${MKDIR} ${WRKSRC}/src/github.com/aws - @${MKDIR} ${WRKSRC}/src/github.com/coreos - @${MKDIR} ${WRKSRC}/src/github.com/fatih - @${MKDIR} ${WRKSRC}/src/github.com/go-ini - @${MKDIR} ${WRKSRC}/src/github.com/go-sql-driver - @${MKDIR} ${WRKSRC}/src/github.com/jmespath - @${MKDIR} ${WRKSRC}/src/github.com/lib - @${MKDIR} ${WRKSRC}/src/github.com/mitchellh - @${MKDIR} ${WRKSRC}/src/github.com/samuel - @${MKDIR} ${WRKSRC}/src/golang.org/x - @${MV} ${WRKSRC_gometrics} ${WRKSRC}/src/github.com/armon/go-metrics - @${MV} ${WRKSRC_goradix} ${WRKSRC}/src/github.com/armon/go-radix - @${MV} ${WRKSRC_awssdkgo} ${WRKSRC}/src/github.com/aws/aws-sdk-go - @${MV} ${WRKSRC_etcd} ${WRKSRC}/src/github.com/coreos/etcd - @${MV} ${WRKSRC_structs} ${WRKSRC}/src/github.com/fatih/structs - @${MV} ${WRKSRC_ini} ${WRKSRC}/src/github.com/go-ini/ini - @${MV} ${WRKSRC_mysql} ${WRKSRC}/src/github.com/go-sql-driver/mysql - @${MV} ${WRKSRC_consul} ${WRKSRC}/src/github.com/hashicorp/consul - @${MV} ${WRKSRC_consultemplate} ${WRKSRC}/src/github.com/hashicorp/consul-template - @${MV} ${WRKSRC_errwrap} ${WRKSRC}/src/github.com/hashicorp/errwrap - @${MV} ${WRKSRC_gocleanhttp} ${WRKSRC}/src/github.com/hashicorp/go-cleanhttp - @${MV} ${WRKSRC_gogatedio} ${WRKSRC}/src/github.com/hashicorp/go-gatedio - @${MV} ${WRKSRC_gomsgpack} ${WRKSRC}/src/github.com/hashicorp/go-msgpack - @${MV} ${WRKSRC_gomultierror} ${WRKSRC}/src/github.com/hashicorp/go-multierror - @${MV} ${WRKSRC_gosyslog} ${WRKSRC}/src/github.com/hashicorp/go-syslog - @${MV} ${WRKSRC_gouuid} ${WRKSRC}/src/github.com/hashicorp/go-uuid - @${MV} ${WRKSRC_golanglru} ${WRKSRC}/src/github.com/hashicorp/golang-lru - @${MV} ${WRKSRC_hcl} ${WRKSRC}/src/github.com/hashicorp/hcl - @${MV} ${WRKSRC_logutils} ${WRKSRC}/src/github.com/hashicorp/logutils - @${MV} ${WRKSRC_serf} ${WRKSRC}/src/github.com/hashicorp/serf - @${MV} ${WRKSRC_vault} ${WRKSRC}/src/github.com/hashicorp/vault - @${MV} ${WRKSRC_gojmespath} ${WRKSRC}/src/github.com/jmespath/go-jmespath - @${MV} ${WRKSRC_pq} ${WRKSRC}/src/github.com/lib/pq - @${MV} ${WRKSRC_copystructure} ${WRKSRC}/src/github.com/mitchellh/copystructure - @${MV} ${WRKSRC_iochan} ${WRKSRC}/src/github.com/mitchellh/iochan - @${MV} ${WRKSRC_mapstructure} ${WRKSRC}/src/github.com/mitchellh/mapstructure - @${MV} ${WRKSRC_reflectwalk} ${WRKSRC}/src/github.com/mitchellh/reflectwalk - @${MV} ${WRKSRC_gozookeeper} ${WRKSRC}/src/github.com/samuel/go-zookeeper - @${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto - @${MV} ${WRKSRC_net} ${WRKSRC}/src/golang.org/x/net do-build: @cd ${WRKSRC}/src/github.com/hashicorp/envconsul; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -o bin/envconsul Modified: head/www/gohugo/Makefile ============================================================================== --- head/www/gohugo/Makefile Tue Dec 13 14:57:04 2016 (r428492) +++ head/www/gohugo/Makefile Tue Dec 13 14:58:08 2016 (r428493) @@ -15,134 +15,54 @@ LICENSE= APACHE20 BUILD_DEPENDS= go>=1.5.0:lang/go USE_GITHUB= yes -GH_ACCOUNT= eknkc:amber \ - spf13:DEFAULT,afero,jWalterWeatherman,cast,cobra \ - spf13:fsync,nitro,pflag,viper \ - yosssi:ace \ - BurntSushi:toml \ - PuerkitoBio:purell,urlesc \ - bep:inflect \ - dchest:cssmin \ - fsnotify:fsnotify \ - gorilla:websocket \ - hashicorp:hcl \ - kardianos:osext \ - kr:fs \ - kyokomi:emoji \ - magiconair:properties \ - miekg:mmark \ - mitchellh:mapstructure \ - pkg:errors,sftp \ - russross:blackfriday \ - shurcooL:sanitized_anchor_name \ - golang:crypto,sys,text,net \ - go-yaml:yaml \ - cpuguy83:go_md2man \ - nicksnyder:go_i18n \ - pelletier:go_toml,go_buffruneio -GH_PROJECT= amber:amber afero:afero \ - jWalterWeatherman:jWalterWeatherman ace:ace toml:toml \ - purell:purell urlesc:urlesc inflect:inflect cssmin:cssmin \ - fsnotify:fsnotify websocket:websocket hcl:hcl osext:osext \ - fs:fs emoji:emoji properties:properties mmark:mmark \ - mapstructure:mapstructure errors:errors sftp:sftp \ - go-md2man:go_md2man blackfriday:blackfriday \ - sanitized_anchor_name:sanitized_anchor_name cast:cast \ - cobra:cobra fsync:fsync nitro:nitro pflag:pflag viper:viper \ - crypto:crypto sys:sys text:text yaml:yaml go-i18n:go_i18n \ - go-toml:go_toml go-buffruneio:go_buffruneio net:net -GH_TAGNAME= 80f9e27:amber 52e4a6c:afero \ - 33c24e7:jWalterWeatherman ea038f4:ace bbd5bb6:toml \ - 8a29053:purell 5bd2802:urlesc b896c45:inflect \ - a65d4d2:go_md2man fb8d9b4:cssmin 944cff2:fsnotify \ - 1f512fc:websocket 6f5bfed:hcl c2c54e5:osext 2788f0d:fs \ - 17c5e70:emoji c265cfa:properties c584d6f:mmark \ - a6ef2f0:mapstructure 645ef00:errors 4d0e916:sftp \ - 0b647d0:blackfriday 1dba4b3:sanitized_anchor_name 2580bc9:cast \ - 9c28e4b:cobra 1773df7:fsync 24d7ef3:nitro b83537d:pflag \ - ec4eb2f:viper d172538:crypto 8d1157a:sys ede1cb9:text \ - a5b47d3:yaml e6c90c3:go_i18n 64ff1ea:go_toml \ - df1e16f:go_buffruneio f4b625e:net +GH_ACCOUNT= spf13 +GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} +GH_TUPLE= eknkc:amber:80f9e27:amber/src/github.com/eknkc/amber \ + spf13:afero:52e4a6c:afero/src/github.com/spf13/afero \ + spf13:jWalterWeatherman:33c24e7:jWalterWeatherman/src/github.com/spf13/jwalterweatherman \ + spf13:cast:2580bc9:cast/src/github.com/spf13/cast \ + spf13:cobra:9c28e4b:cobra/src/github.com/spf13/cobra \ + spf13:fsync:1773df7:fsync/src/github.com/spf13/fsync \ + spf13:nitro:24d7ef3:nitro/src/github.com/spf13/nitro \ + spf13:pflag:b83537d:pflag/src/github.com/spf13/pflag \ + spf13:viper:ec4eb2f:viper/src/github.com/spf13/viper \ + yosssi:ace:ea038f4:ace/src/github.com/yosssi/ace \ + BurntSushi:toml:bbd5bb6:toml/src/github.com/BurntSushi/toml \ + PuerkitoBio:purell:8a29053:purell/src/github.com/PuerkitoBio/purell \ + PuerkitoBio:urlesc:5bd2802:urlesc/src/github.com/PuerkitoBio/urlesc \ + bep:inflect:b896c45:inflect/src/github.com/bep/inflect \ + dchest:cssmin:fb8d9b4:cssmin/src/github.com/dchest/cssmin \ + fsnotify:fsnotify:944cff2:fsnotify/src/github.com/fsnotify/fsnotify \ + gorilla:websocket:1f512fc:websocket/src/github.com/gorilla/websocket \ + hashicorp:hcl:6f5bfed:hcl/src/github.com/hashicorp/hcl \ + kardianos:osext:c2c54e5:osext/src/github.com/kardianos/osext \ + kr:fs:2788f0d:fs/src/github.com/kr/fs \ + kyokomi:emoji:17c5e70:emoji/src/github.com/kyokomi/emoji \ + magiconair:properties:c265cfa:properties/src/github.com/magiconair/properties \ + miekg:mmark:c584d6f:mmark/src/github.com/miekg/mmark \ + mitchellh:mapstructure:a6ef2f0:mapstructure/src/github.com/mitchellh/mapstructure \ + pkg:errors:645ef00:errors/src/github.com/pkg/errors \ + pkg:sftp:4d0e916:sftp/src/github.com/pkg/sftp \ + russross:blackfriday:0b647d0:blackfriday/src/github.com/russross/blackfriday \ + shurcooL:sanitized_anchor_name:1dba4b3:sanitized_anchor_name/src/github.com/shurcooL/sanitized_anchor_name \ + golang:crypto:d172538:crypto/src/golang.org/x/crypto \ + golang:sys:8d1157a:sys/src/golang.org/x/sys \ + golang:text:ede1cb9:text/src/golang.org/x/text \ + golang:net:f4b625e:net/src/golang.org/x/net \ + go-yaml:yaml:a5b47d3:yaml/src/gopkg.in/yaml.v2 \ + cpuguy83:go-md2man:a65d4d2:go_md2man/src/github.com/cpuguy83/go-md2man \ + nicksnyder:go-i18n:e6c90c3:go_i18n/src/github.com/nicksnyder/go-i18n \ + pelletier:go-toml:64ff1ea:go_toml/src/github.com/pelletier/go-toml \ + pelletier:go-buffruneio:df1e16f:go_buffruneio/src/github.com/pelletier/go-buffruneio STRIP= # stripping can break go binaries -post-extract: - @${MKDIR} ${WRKSRC}/src/github.com/BurntSushi - @${MKDIR} ${WRKSRC}/src/github.com/PuerkitoBio - @${MKDIR} ${WRKSRC}/src/github.com/bep - @${MKDIR} ${WRKSRC}/src/github.com/cpuguy83 - @${MKDIR} ${WRKSRC}/src/github.com/dchest - @${MKDIR} ${WRKSRC}/src/github.com/eknkc - @${MKDIR} ${WRKSRC}/src/github.com/fsnotify - @${MKDIR} ${WRKSRC}/src/github.com/gorilla - @${MKDIR} ${WRKSRC}/src/github.com/hashicorp - @${MKDIR} ${WRKSRC}/src/github.com/kardianos - @${MKDIR} ${WRKSRC}/src/github.com/kr - @${MKDIR} ${WRKSRC}/src/github.com/kyokomi - @${MKDIR} ${WRKSRC}/src/github.com/magiconair - @${MKDIR} ${WRKSRC}/src/github.com/miekg - @${MKDIR} ${WRKSRC}/src/github.com/mitchellh - @${MKDIR} ${WRKSRC}/src/github.com/pkg - @${MKDIR} ${WRKSRC}/src/github.com/russross - @${MKDIR} ${WRKSRC}/src/github.com/shurcooL - @${MKDIR} ${WRKSRC}/src/github.com/spf13 - @${MKDIR} ${WRKSRC}/src/github.com/spf13/hugo - @${MKDIR} ${WRKSRC}/src/github.com/yosssi - @${MKDIR} ${WRKSRC}/src/github.com/nicksnyder - @${MKDIR} ${WRKSRC}/src/github.com/pelletier - @${MKDIR} ${WRKSRC}/src/golang.org/x - @${MKDIR} ${WRKSRC}/src/gopkg.in -.for src in CONTRIBUTING.md Dockerfile LICENSE.md Makefile README.md bench.sh \ - bufferpool commands create docs examples helpers hugofs \ - hugolib livereload main.go parser requirements.txt source \ - target tpl transform utils watcher wercker.yml - @${MV} ${WRKSRC}/${src} \ - ${WRKSRC}/src/github.com/spf13/${PORTNAME} -.endfor - @${MV} ${WRKSRC_toml} ${WRKSRC}/src/github.com/BurntSushi/toml - @${MV} ${WRKSRC_purell} ${WRKSRC}/src/github.com/PuerkitoBio/purell - @${MV} ${WRKSRC_urlesc} ${WRKSRC}/src/github.com/PuerkitoBio/urlesc - @${MV} ${WRKSRC_inflect} ${WRKSRC}/src/github.com/bep/inflect - @${MV} ${WRKSRC_go_md2man} ${WRKSRC}/src/github.com/cpuguy83/go-md2man - @${MV} ${WRKSRC_cssmin} ${WRKSRC}/src/github.com/dchest/cssmin - @${MV} ${WRKSRC_amber} ${WRKSRC}/src/github.com/eknkc/amber - @${MV} ${WRKSRC_fsnotify} ${WRKSRC}/src/github.com/fsnotify/fsnotify - @${MV} ${WRKSRC_websocket} ${WRKSRC}/src/github.com/gorilla/websocket - @${MV} ${WRKSRC_hcl} ${WRKSRC}/src/github.com/hashicorp/hcl - @${MV} ${WRKSRC_osext} ${WRKSRC}/src/github.com/kardianos/osext - @${MV} ${WRKSRC_fs} ${WRKSRC}/src/github.com/kr/fs - @${MV} ${WRKSRC_emoji} ${WRKSRC}/src/github.com/kyokomi/emoji - @${MV} ${WRKSRC_properties} ${WRKSRC}/src/github.com/magiconair/properties - @${MV} ${WRKSRC_mmark} ${WRKSRC}/src/github.com/miekg/mmark - @${MV} ${WRKSRC_mapstructure} ${WRKSRC}/src/github.com/mitchellh/mapstructure - @${MV} ${WRKSRC_errors} ${WRKSRC}/src/github.com/pkg/errors - @${MV} ${WRKSRC_sftp} ${WRKSRC}/src/github.com/pkg/sftp - @${MV} ${WRKSRC_blackfriday} ${WRKSRC}/src/github.com/russross/blackfriday - @${MV} ${WRKSRC_sanitized_anchor_name} ${WRKSRC}/src/github.com/shurcooL/sanitized_anchor_name - @${MV} ${WRKSRC_afero} ${WRKSRC}/src/github.com/spf13/afero - @${MV} ${WRKSRC_cast} ${WRKSRC}/src/github.com/spf13/cast - @${MV} ${WRKSRC_cobra} ${WRKSRC}/src/github.com/spf13/cobra - @${MV} ${WRKSRC_fsync} ${WRKSRC}/src/github.com/spf13/fsync - @${MV} ${WRKSRC_jWalterWeatherman} ${WRKSRC}/src/github.com/spf13/jwalterweatherman - @${MV} ${WRKSRC_nitro} ${WRKSRC}/src/github.com/spf13/nitro - @${MV} ${WRKSRC_pflag} ${WRKSRC}/src/github.com/spf13/pflag - @${MV} ${WRKSRC_viper} ${WRKSRC}/src/github.com/spf13/viper - @${MV} ${WRKSRC_ace} ${WRKSRC}/src/github.com/yosssi/ace - @${MV} ${WRKSRC_go_i18n} ${WRKSRC}/src/github.com/nicksnyder/go-i18n - @${MV} ${WRKSRC_go_toml} ${WRKSRC}/src/github.com/pelletier/go-toml - @${MV} ${WRKSRC_go_buffruneio} ${WRKSRC}/src/github.com/pelletier/go-buffruneio - @${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto - @${MV} ${WRKSRC_sys} ${WRKSRC}/src/golang.org/x/sys - @${MV} ${WRKSRC_text} ${WRKSRC}/src/golang.org/x/text - @${MV} ${WRKSRC_net} ${WRKSRC}/src/golang.org/x/net - @${MV} ${WRKSRC_yaml} ${WRKSRC}/src/gopkg.in/yaml.v2 - do-build: - @cd ${WRKSRC}/src/github.com/spf13/${PORTNAME} && ${SETENV} GOPATH=${WRKSRC} go build -o bin/${PORTNAME} - @cd ${WRKSRC}/src/github.com/spf13/${PORTNAME} && ./bin/${PORTNAME} gen man --dir man/man1/ + @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} && ${SETENV} GOPATH=${WRKSRC} go build -o bin/${PORTNAME} + @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} && ./bin/${PORTNAME} gen man --dir man/man1/ do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/spf13/${PORTNAME}/bin/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}/bin/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME} .for i in hugo.1 hugo_benchmark.1 hugo_check.1 hugo_config.1 hugo_convert.1 \ hugo_convert_toJSON.1 hugo_convert_toTOML.1 \ hugo_convert_toYAML.1 hugo_gen.1 hugo_gen_autocomplete.1 \ @@ -151,7 +71,7 @@ do-install: hugo_list_future.1 hugo_new.1 hugo_new_site.1 hugo_new_theme.1 \ hugo_server.1 hugo_undraft.1 hugo_version.1 hugo_env.1 \ hugo_list_expired.1 - ${INSTALL_MAN} ${WRKSRC}/src/github.com/spf13/${PORTNAME}/man/man1/$i ${STAGEDIR}/${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}/man/man1/$i ${STAGEDIR}/${PREFIX}/man/man1 .endfor .include <bsd.port.mk> Modified: head/www/grafana2/Makefile ============================================================================== --- head/www/grafana2/Makefile Tue Dec 13 14:57:04 2016 (r428492) +++ head/www/grafana2/Makefile Tue Dec 13 14:58:08 2016 (r428493) @@ -1,10 +1,13 @@ # $FreeBSD$ -PORTNAME= grafana2 +PORTNAME= grafana PORTVERSION= 2.6.0 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www +MASTER_SITES= http://files.bartelmess.io/public/:static_assets +PKGNAMESUFFIX= 2 +DISTFILES= grafana-static-${PORTVERSION}.tar.gz:static_assets MAINTAINER= thomas@bartelmess.io COMMENT= Dashboard and graph editor for Graphite, InfluxDB & OpenTSDB @@ -20,28 +23,33 @@ USE_RC_SUBR= grafana2 USES= compiler USE_GITHUB= yes -GH_ACCOUNT= grafana rainycape:unidecode aws:aws_sdk_go \ - Unknwon:macaron,com jtolds:gls streadway:amqp mattn:go_sqlite3 \ - davecgh:go_spew golang:net,oauth2 smartystreets:goconvey \ - jmespath:go_jmespath go-bufio:bufio BurntSushi:toml gosimple:slug \ - go-sql-driver:mysql macaron-contrib:session,binding lib:pq \ - go-ldap:ldap go-redis:redis go-ini:ini go-xorm:core,xorm \ - go-asn1-ber:asn1_ber -GH_PROJECT= grafana mysql:mysql aws-sdk-go:aws_sdk_go ini:ini \ - session:session gls:gls core:core bufio:bufio net:net \ - go-sqlite3:go_sqlite3 go-jmespath:go_jmespath slug:slug xorm:xorm \ - amqp:amqp redis:redis macaron:macaron toml:toml go-spew:go_spew \ - goconvey:goconvey asn1-ber:asn1_ber pq:pq binding:binding \ - unidecode:unidecode ldap:ldap com:com oauth2:oauth2 -GH_TAGNAME= \ - v1.2-26-g9543750:mysql 972f0c5:net v1.0.0:aws_sdk_go \ - v0-16-g1772191:ini 31e841d:session f1ac7f4:gls c58fcf0:oauth2 \ - v1:bufio go1.0-cutoff-13-g19eeca3:pq v0.1.0-21-g056c9bc:toml \ - 8d25846:slug v0.4.2-58-ge2889e5:xorm 0.2.2:go_jmespath \ - 150b7f2:amqp v2.3.2:redis 93de4f3:macaron e28cd44:go_sqlite3 \ - d9bcf40:com 1.5.0-356-gfbc0a1c:goconvey v1:asn1_ber \ - 0fbe4b9:binding 836ef0a:unidecode v1-19-g83e6542:ldap \ - 2df1748:go_spew be6e7ac:core +GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} +GH_TUPLE= \ + BurntSushi:toml:v0.1.0-21-g056c9bc:toml/src/github.com/BurntSushi/toml \ + Unknwon:macaron:93de4f3:macaron/src/github.com/Unknwon/macaron \ + Unknwon:com:d9bcf40:com/src/github.com/Unknwon/com \ + davecgh:go-spew:2df1748:go_spew/src/github.com/davecgh/go-spew \ + go-bufio:bufio:v1:bufio/src/gopkg.in/bufio.v1 \ + macaron-contrib:binding:0fbe4b9:binding/src/github.com/macaron-contrib/binding \ + macaron-contrib:session:31e841d:session/src/github.com/macaron-contrib/session \ + jmespath:go-jmespath:0.2.2:go_jmespath/src/github.com/jmespath/go-jmespath \ + lib:pq:go1.0-cutoff-13-g19eeca3:pq/src/github.com/lib/pq \ + jtolds:gls:f1ac7f4:gls/src/github.com/jtolds/gls \ + go-asn1-ber:asn1-ber:v1:asn1_ber/src/gopkg.in/asn1-ber.v1 \ + go-xorm:core:be6e7ac:core/src/github.com/go-xorm/core \ + go-xorm:xorm:v0.4.2-58-ge2889e5:xorm/src/github.com/go-xorm/xorm \ + go-ini:ini:v0-16-g1772191:ini/src/gopkg.in/ini.v1 \ + aws:aws-sdk-go:v1.0.0:aws_sdk_go/src/github.com/aws/aws-sdk-go \ + mattn:go-sqlite3:e28cd44:go_sqlite3/src/github.com/mattn/go-sqlite3 \ + go-ldap:ldap:v1-19-g83e6542:ldap/src/github.com/go-ldap/ldap \ + go-redis:redis:v2.3.2:redis/src/gopkg.in/redis.v2 \ + gosimple:slug:8d25846:slug/src/github.com/gosimple/slug \ + streadway:amqp:150b7f2:amqp/src/github.com/streadway/amqp \ + golang:oauth2:c58fcf0:oauth2/src/golang.org/x/oauth2 \ + golang:net:972f0c5:net/src/golang.org/x/net \ + smartystreets:goconvey:1.5.0-356-gfbc0a1c:goconvey/src/github.com/smartystreets/goconvey \ + rainycape:unidecode:836ef0a:unidecode/src/github.com/rainycape/unidecode \ + go-sql-driver:mysql:v1.2-26-g9543750:mysql/src/github.com/go-sql-driver/mysql GRAFANA_USER?= grafana GRAFANA_GROUP?= grafana @@ -50,9 +58,9 @@ USERS= ${GRAFANA_USER} GROUPS= ${GRAFANA_GROUP} GRAFANAHOMEDIR= ${PREFIX}/share/grafana/ -GRAFANADATADIR= /var/db/${PORTNAME}/ -GRAFANALOGDIR= /var/log/${PORTNAME}/ -GRAFANAPIDDIR= /var/run/${PORTNAME}/ +GRAFANADATADIR= /var/db/${PKGBASE}/ +GRAFANALOGDIR= /var/log/${PKGBASE}/ +GRAFANAPIDDIR= /var/run/${PKGBASE}/ SUB_FILES= grafana2 grafana2.conf SUB_LIST+= GRAFANA_USER=${GRAFANA_USER} \ @@ -64,85 +72,23 @@ SUB_LIST+= GRAFANA_USER=${GRAFANA_USER} PLIST_SUB+= GRAFANAHOMEDIR=${GRAFANAHOMEDIR} -MASTER_SITES+= http://files.bartelmess.io/public/:static_assets -DISTFILES+= grafana-static-${PORTVERSION}.tar.gz:static_assets - post-extract: - @${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana -.for src in .bra.toml .jscs.json CHANGELOG.md Gruntfile.js README.md build.go docker main.go pkg tasks \ - .gitignore .jsfmtrc CONTRIBUTING.md LICENSE.md appveyor.yml circle.yml docs package.json public tests \ - .hooks .jshintrc Godeps NOTICE.md benchmarks conf latest.json packaging vendor - @${MV} ${WRKSRC}/${src} \ - ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana -.endfor - @${MKDIR} ${WRKSRC}/src/github.com/go-sql-driver - @${MKDIR} ${WRKSRC}/src/github.com/aws - @${MKDIR} ${WRKSRC}/src/gopkg.in - @${MKDIR} ${WRKSRC}/src/github.com/macaron-contrib - @${MKDIR} ${WRKSRC}/src/github.com/jtolds - @${MKDIR} ${WRKSRC}/src/github.com/go-xorm - @${MKDIR} ${WRKSRC}/src/gopkg.in - @${MKDIR} ${WRKSRC}/src/github.com/mattn - @${MKDIR} ${WRKSRC}/src/github.com/jmespath - @${MKDIR} ${WRKSRC}/src/golang.org/x - @${MKDIR} ${WRKSRC}/src/github.com/gosimple - @${MKDIR} ${WRKSRC}/src/github.com/smartystreets - @${MKDIR} ${WRKSRC}/src/github.com/davecgh - @${MKDIR} ${WRKSRC}/src/github.com/streadway - @${MKDIR} ${WRKSRC}/src/golang.org/x - @${MKDIR} ${WRKSRC}/src/gopkg.in - @${MKDIR} ${WRKSRC}/src/github.com/Unknwon - @${MKDIR} ${WRKSRC}/src/github.com/macaron-contrib - @${MKDIR} ${WRKSRC}/src/github.com/go-xorm - @${MKDIR} ${WRKSRC}/src/github.com/Unknwon - @${MKDIR} ${WRKSRC}/src/gopkg.in - @${MKDIR} ${WRKSRC}/src/github.com/BurntSushi - @${MKDIR} ${WRKSRC}/src/github.com/rainycape - @${MKDIR} ${WRKSRC}/src/github.com/go-ldap - @${MKDIR} ${WRKSRC}/src/github.com/lib - - @${MV} ${WRKSRC_mysql} ${WRKSRC}/src/github.com/go-sql-driver/mysql - @${MV} ${WRKSRC_aws_sdk_go} ${WRKSRC}/src/github.com/aws/aws-sdk-go - @${MV} ${WRKSRC_ini} ${WRKSRC}/src/gopkg.in/ini.v1 - @${MV} ${WRKSRC_session} ${WRKSRC}/src/github.com/macaron-contrib/session - @${MV} ${WRKSRC_gls} ${WRKSRC}/src/github.com/jtolds/gls - @${MV} ${WRKSRC_core} ${WRKSRC}/src/github.com/go-xorm/core - @${MV} ${WRKSRC_bufio} ${WRKSRC}/src/gopkg.in/bufio.v1 - @${MV} ${WRKSRC_go_sqlite3} ${WRKSRC}/src/github.com/mattn/go-sqlite3 - @${MV} ${WRKSRC_go_jmespath} ${WRKSRC}/src/github.com/jmespath/go-jmespath - @${MV} ${WRKSRC_net} ${WRKSRC}/src/golang.org/x/net - @${MV} ${WRKSRC_slug} ${WRKSRC}/src/github.com/gosimple/slug - @${MV} ${WRKSRC_goconvey} ${WRKSRC}/src/github.com/smartystreets/goconvey - @${MV} ${WRKSRC_go_spew} ${WRKSRC}/src/github.com/davecgh/go-spew - @${MV} ${WRKSRC_amqp} ${WRKSRC}/src/github.com/streadway/amqp - @${MV} ${WRKSRC_oauth2} ${WRKSRC}/src/golang.org/x/oauth2 - @${MV} ${WRKSRC_redis} ${WRKSRC}/src/gopkg.in/redis.v2 - @${MV} ${WRKSRC_macaron} ${WRKSRC}/src/github.com/Unknwon/macaron - @${MV} ${WRKSRC_binding} ${WRKSRC}/src/github.com/macaron-contrib/binding - @${MV} ${WRKSRC_xorm} ${WRKSRC}/src/github.com/go-xorm/xorm - @${MV} ${WRKSRC_com} ${WRKSRC}/src/github.com/Unknwon/com - @${MV} ${WRKSRC_asn1_ber} ${WRKSRC}/src/gopkg.in/asn1-ber.v1 - @${MV} ${WRKSRC_toml} ${WRKSRC}/src/github.com/BurntSushi/toml - @${MV} ${WRKSRC_unidecode} ${WRKSRC}/src/github.com/rainycape/unidecode - @${MV} ${WRKSRC_ldap} ${WRKSRC}/src/github.com/go-ldap/ldap - @${MV} ${WRKSRC_pq} ${WRKSRC}/src/github.com/lib/pq - - ${RM} -r ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana/public - ${MV} ${WRKDIR}/public ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana/ - ${RM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana/public/.DS_Store - ${RM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana/public/app/.DS_Store - ${RM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana/public/._.DS_Store - ${RM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana/public/app/._.DS_Store + ${RM} -r ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/public + ${MV} ${WRKDIR}/public ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/ + ${RM} ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/public/.DS_Store + ${RM} ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/public/app/.DS_Store + ${RM} ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/public/._.DS_Store + ${RM} ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/public/app/._.DS_Store do-build: - cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana; \ + cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}; \ ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go run build.go build do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana/bin/grafana-server \ + ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/bin/grafana-server \ ${STAGEDIR}${PREFIX}/bin/grafana-server - cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana && \ - ${COPYTREE_SHARE} public ${STAGEDIR}${PREFIX}/share/grafana + cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} && \ + ${COPYTREE_SHARE} public ${STAGEDIR}${PREFIX}/share/${PORTNAME} ${MKDIR} ${STAGEDIR}${GRAFANAPIDDIR} ${MKDIR} ${STAGEDIR}${GRAFANALOGDIR} ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR} *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612131458.uBDEw8Kb069211>