Index: head/misc/cryptoballot/Makefile =================================================================== --- head/misc/cryptoballot/Makefile +++ head/misc/cryptoballot/Makefile @@ -13,35 +13,24 @@ USE_GITHUB= yes GH_TAGNAME= 3753e1b -GH_TUPLE= ${PORTNAME}:entropychecker:188ae6c:entropychecker/src/github.com/${PORTNAME}/entropychecker \ - ${PORTNAME}:fdh:5eb31ce:fdh/src/github.com/${PORTNAME}/fdh \ - ${PORTNAME}:rsablind:14f9913:rsablind/src/github.com/${PORTNAME}/rsablind \ - urfave:cli:v1.20.0:cli/src/github.com/urfave/cli \ - phayes:decryptpem:7e4f5bc:decryptpem/src/github.com/phayes/decryptpem \ - phayes:errors:ad407e6:errors/src/github.com/phayes/errors \ - dlintw:goconf:dcc0709:goconf/src/github.com/dlintw/goconf \ - Sam-Izdat:govote:7d55c89:govote/src/github.com/Sam-Izdat/govote \ - lib:pq:88edab0:pq/src/github.com/lib/pq \ - golang:crypto:650f4a3:crypto/src/golang.org/x/crypto \ - golang:sys:37707fd:sys/src/golang.org/x/sys +GH_TUPLE= ${PORTNAME}:entropychecker:188ae6c:entropychecker/vendor/github.com/${PORTNAME}/entropychecker \ + ${PORTNAME}:fdh:5eb31ce:fdh/vendor/github.com/${PORTNAME}/fdh \ + ${PORTNAME}:rsablind:14f9913:rsablind/vendor/github.com/${PORTNAME}/rsablind \ + urfave:cli:v1.20.0:cli/vendor/github.com/urfave/cli \ + phayes:decryptpem:7e4f5bc:decryptpem/vendor/github.com/phayes/decryptpem \ + phayes:errors:ad407e6:errors/vendor/github.com/phayes/errors \ + dlintw:goconf:dcc0709:goconf/vendor/github.com/dlintw/goconf \ + Sam-Izdat:govote:7d55c89:govote/vendor/github.com/Sam-Izdat/govote \ + lib:pq:88edab0:pq/vendor/github.com/lib/pq \ + golang:crypto:650f4a3:crypto/vendor/golang.org/x/crypto \ + golang:sys:37707fd:sys/vendor/golang.org/x/sys GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} -PROGS= servers/ballotbox servers/electionclerk \ - utils/cryptoballot \ - utils/cryptoballot-getid utils/cryptoballot-public-key \ - utils/cryptoballot-sign utils/cryptoballot-signature-request +GO_TARGET= ./servers/ballotbox ./servers/electionclerk \ + ./utils/cryptoballot \ + ./utils/cryptoballot-getid ./utils/cryptoballot-public-key \ + ./utils/cryptoballot-sign ./utils/cryptoballot-signature-request -PLIST_FILES= ${PROGS:C/.*\//bin\//} - -do-build: -.for p in ${PROGS} - @cd ${WRKSRC}/${GH_SUBDIR}/${p}/ && \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${p:C/.*\///} -.endfor - -do-install: -.for p in ${PROGS} - ${INSTALL_PROGRAM} ${WRKSRC}/${GH_SUBDIR}/${p}/${p:C/.*\///} ${STAGEDIR}${PREFIX}/bin/${p:C/.*\///} -.endfor +PLIST_FILES= ${GO_TARGET:C/.*\//bin\//} .include Index: head/misc/dive/Makefile =================================================================== --- head/misc/dive/Makefile +++ head/misc/dive/Makefile @@ -43,7 +43,7 @@ mattn:go-runewidth:v0.0.3:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ mitchellh:go-homedir:v1.0.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \ mitchellh:mapstructure:v1.0.0:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \ - moby:moby:0b7cb16dde4a20d024c7be59801d63bcfd18611b:moby_moby/vendor/github.com/moby/moby \ + moby:moby:0b7cb16dde4a20d024c7be59801d63bcfd18611b:moby_moby/vendor/github.com/docker/docker \ nsf:termbox-go:60ab7e3d12ed:nsf_termbox_go/vendor/github.com/nsf/termbox-go \ opencontainers:go-digest:v1.0.0-rc1:opencontainers_go_digest/vendor/github.com/opencontainers/go-digest \ opencontainers:image-spec:v1.0.1:opencontainers_image_spec/vendor/github.com/opencontainers/image-spec \ @@ -61,8 +61,5 @@ wagoodman:keybinding:6a824da6df05:wagoodman_keybinding/vendor/github.com/wagoodman/keybinding PLIST_FILES= bin/${PORTNAME} - -post-patch: - @${GREP} -rl github.com/docker/docker ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} 's|github.com/docker/docker|github.com/moby/moby|' .include Index: head/misc/exercism/Makefile =================================================================== --- head/misc/exercism/Makefile +++ head/misc/exercism/Makefile @@ -14,61 +14,60 @@ USES= go USE_GITHUB= yes GH_TUPLE= \ - exercism:cli:v${PORTVERSION}:DEFAULT/src/github.com/exercism/cli \ - armon:consul-api:eb2c6b5:consulapi/src/github.com/armon/consul-api \ - blang:semver:v3.5.1:semver/src/github.com/blang/semver \ - coreos:etcd:v0.2.0:etcd/src/github.com/coreos/etcd \ - coreos:go-semver:v0.2.0:gosemver/src/github.com/coreos/go-semver \ - cpuguy83:go-md2man:v1.0.8:md2man/src/github.com/cpuguy83/go-md2man \ - davecgh:go-spew:v1.1.0:gospew/src/github.com/davecgh/go-spew \ - fsnotify:fsnotify:v1.4.2:fsnotify/src/github.com/fsnotify/fsnotify \ - hashicorp:hcl:392dba7:hcl/src/github.com/hashicorp/hcl \ - golang:protobuf:v1.2.0:protobuf/src/github.com/golang/protobuf \ - inconshreveable:go-update:8152e7e:goupdate/src/github.com/inconshreveable/go-update \ - inconshreveable:mousetrap:v1.0:mousetrap/src/github.com/inconshreveable/mousetrap \ - kr:fs:v0.1.0:fs/src/github.com/kr/fs \ - kr:pretty:v0.1.0:pretty/src/github.com/kr/pretty \ - kr:text:v0.1.0:text/src/github.com/kr/text \ - magiconair:properties:v1.7.3:properties/src/github.com/magiconair/properties \ - mitchellh:go-homedir:v1.0.0:gohomedir/src/github.com/mitchellh/go-homedir \ - mitchellh:mapstructure:d0303fe:mapstructure/src/github.com/mitchellh/mapstructure \ - pelletier:go-buffruneio:v0.2.0:gobuffruneio/src/github.com/pelletier/go-buffruneio \ - pelletier:go-toml:v1.0.0:gotoml/src/github.com/pelletier/go-toml \ - pkg:errors:v0.8.0:errors/src/github.com/pkg/errors \ - pkg:sftp:v1.8.3:sftp/src/github.com/pkg/sftp \ - pmezard:go-difflib:v1.0.0:godifflib/src/github.com/pmezard/go-difflib \ - russross:blackfriday:v1.5.1:blackfriday/src/github.com/russross/blackfriday \ - spf13:afero:9be6508:afero/src/github.com/spf13/afero \ - spf13:cast:v1.1.0:cast/src/github.com/spf13/cast \ - spf13:cobra:b26b538:cobra/src/github.com/spf13/cobra \ - spf13:jWalterWeatherman:0efa520:jww/src/github.com/spf13/jwalterweatherman \ - spf13:pflag:e57e3ee:pflag/src/github.com/spf13/pflag \ - spf13:viper:1573881:viper/src/github.com/spf13/viper \ - stretchr:objx:v0.1.1:objx/src/github.com/stretchr/objx \ - stretchr:testify:v1.1.4:testify/src/github.com/stretchr/testify \ - ugorji:go:v1.1.1:ugorji/src/github.com/ugorji/go \ - xordataexchange:crypt:b2862e3:dataexchange/src/github.com/xordataexchange/crypt \ - golang:crypto:0e37d00:crypto/src/golang.org/x/crypto \ - golang:net:f5079bd:net/src/golang.org/x/net \ - golang:oauth2:d2e6202:oauth2/src/golang.org/x/oauth2 \ - golang:sys:d8f5ea2:sys/src/golang.org/x/sys \ - golang:text:3bd178b:text/src/golang.org/x/text \ - golang:tools:90fa682:tour/src/golang.org/x/tools \ - golang:appengine:ae0ab99:appengine/src/google.golang.org/appengine \ - googleapis:google-api-go-client:920bb1b:gapis/src/google.golang.org/api \ - GoogleCloudPlatform:google-cloud-go:v0.28.0:gcloudgo/src/cloud.google.com/go \ - go4org:go4:417644f:go4/src/go4.org \ - go-check:check:788fd78:gocheck/src/gopkg.in/check.v1 \ - go-yaml:yaml:25c4ec8:yaml/src/gopkg.in/yaml.v2 -GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} + exercism:cli:v${PORTVERSION}:DEFAULT \ + armon:consul-api:eb2c6b5:consulapi/vendor/github.com/armon/consul-api \ + blang:semver:v3.5.1:semver/vendor/github.com/blang/semver \ + coreos:etcd:v0.2.0:etcd/vendor/github.com/coreos/etcd \ + coreos:go-semver:v0.2.0:gosemver/vendor/github.com/coreos/go-semver \ + cpuguy83:go-md2man:v1.0.8:md2man/vendor/github.com/cpuguy83/go-md2man \ + davecgh:go-spew:v1.1.0:gospew/vendor/github.com/davecgh/go-spew \ + fsnotify:fsnotify:v1.4.2:fsnotify/vendor/github.com/fsnotify/fsnotify \ + hashicorp:hcl:392dba7:hcl/vendor/github.com/hashicorp/hcl \ + golang:protobuf:v1.2.0:protobuf/vendor/github.com/golang/protobuf \ + inconshreveable:go-update:8152e7e:goupdate/vendor/github.com/inconshreveable/go-update \ + inconshreveable:mousetrap:v1.0:mousetrap/vendor/github.com/inconshreveable/mousetrap \ + kr:fs:v0.1.0:fs/vendor/github.com/kr/fs \ + kr:pretty:v0.1.0:pretty/vendor/github.com/kr/pretty \ + kr:text:v0.1.0:text/vendor/github.com/kr/text \ + magiconair:properties:v1.7.3:properties/vendor/github.com/magiconair/properties \ + mitchellh:go-homedir:v1.0.0:gohomedir/vendor/github.com/mitchellh/go-homedir \ + mitchellh:mapstructure:d0303fe:mapstructure/vendor/github.com/mitchellh/mapstructure \ + pelletier:go-buffruneio:v0.2.0:gobuffruneio/vendor/github.com/pelletier/go-buffruneio \ + pelletier:go-toml:v1.0.0:gotoml/vendor/github.com/pelletier/go-toml \ + pkg:errors:v0.8.0:errors/vendor/github.com/pkg/errors \ + pkg:sftp:v1.8.3:sftp/vendor/github.com/pkg/sftp \ + pmezard:go-difflib:v1.0.0:godifflib/vendor/github.com/pmezard/go-difflib \ + russross:blackfriday:v1.5.1:blackfriday/vendor/github.com/russross/blackfriday \ + spf13:afero:9be6508:afero/vendor/github.com/spf13/afero \ + spf13:cast:v1.1.0:cast/vendor/github.com/spf13/cast \ + spf13:cobra:b26b538:cobra/vendor/github.com/spf13/cobra \ + spf13:jWalterWeatherman:0efa520:jww/vendor/github.com/spf13/jwalterweatherman \ + spf13:pflag:e57e3ee:pflag/vendor/github.com/spf13/pflag \ + spf13:viper:1573881:viper/vendor/github.com/spf13/viper \ + stretchr:objx:v0.1.1:objx/vendor/github.com/stretchr/objx \ + stretchr:testify:v1.1.4:testify/vendor/github.com/stretchr/testify \ + ugorji:go:v1.1.1:ugorji/vendor/github.com/ugorji/go \ + xordataexchange:crypt:b2862e3:dataexchange/vendor/github.com/xordataexchange/crypt \ + golang:crypto:0e37d00:crypto/vendor/golang.org/x/crypto \ + golang:net:f5079bd:net/vendor/golang.org/x/net \ + golang:oauth2:d2e6202:oauth2/vendor/golang.org/x/oauth2 \ + golang:sys:d8f5ea2:sys/vendor/golang.org/x/sys \ + golang:text:3bd178b:text/vendor/golang.org/x/text \ + golang:tools:90fa682:tour/vendor/golang.org/x/tools \ + golang:appengine:ae0ab99:appengine/vendor/google.golang.org/appengine \ + googleapis:google-api-go-client:920bb1b:gapis/vendor/google.golang.org/api \ + GoogleCloudPlatform:google-cloud-go:v0.28.0:gcloudgo/vendor/cloud.google.com/go \ + go4org:go4:417644f:go4/vendor/go4.org \ + go-check:check:788fd78:gocheck/vendor/gopkg.in/check.v1 \ + go-yaml:yaml:25c4ec8:yaml/vendor/gopkg.in/yaml.v2 -PLIST_FILES= bin/exercism +GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} +GO_TARGET= ./exercism +GO_BUILDFLAGS= -ldflags="\ + -s -w \ + -X github.com/exercism/cli/cmd.BuildOS=freebsd \ + -X github.com/exercism/cli/cmd.BuildARCH=${ARCH}" -do-build: - @(cd ${WRKSRC} ; \ - ${SETENV} ${MAKE_ENV} GO15VENDOREXPERIMENT=1 GOPATH=${WRKSRC} go build -ldflags "-s -w -X github.com/exercism/cli/cmd.BuildOS=freebsd -X github.com/exercism/cli/cmd.BuildARCH=${ARCH}" -o out/exercism exercism/main.go) - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/out/exercism ${STAGEDIR}${PREFIX}/bin +PLIST_FILES= bin/exercism .include Index: head/net-im/xmpp-client/Makefile =================================================================== --- head/net-im/xmpp-client/Makefile +++ head/net-im/xmpp-client/Makefile @@ -14,20 +14,17 @@ USES= go USE_GITHUB= yes -GH_TUPLE= agl:xmpp-client:3030ad4:DEFAULT/src/github.com/agl/xmpp-client \ - golang:crypto:c126467:crypto/src/golang.org/x/crypto \ - golang:net:a680a1e:net/src/golang.org/x/net \ - golang:sys:ac767d6:sys/src/golang.org/x/sys +GH_TUPLE= agl:xmpp-client:3030ad4:DEFAULT/vendor/github.com/agl/xmpp-client \ + golang:crypto:c126467:crypto/vendor/golang.org/x/crypto \ + golang:net:a680a1e:net/vendor/golang.org/x/net \ + golang:sys:ac767d6:sys/vendor/golang.org/x/sys +GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} + PLIST_FILES= bin/xmpp-client -do-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${PORTNAME} - do-test: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go test . ./xmpp - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + cd ${WRKSRC}; \ + ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_BUILDFLAGS} . ./xmpp .include Index: head/net-mgmt/carbon-relay-ng/Makefile =================================================================== --- head/net-mgmt/carbon-relay-ng/Makefile +++ head/net-mgmt/carbon-relay-ng/Makefile @@ -19,19 +19,15 @@ GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} USE_RC_SUBR= ${PORTNAME} +GO_TARGET= ./cmd/${PORTNAME} + USERS= carbon GROUPS= carbon -do-build: - @cd ${WRKSRC}/${GH_SUBDIR} && \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} VERSION=${DISTVERSION} \ - ${MAKE_CMD} build - -do-install: +post-install: @${MKDIR} ${STAGEDIR}/${PREFIX}/etc/carbon-relay-ng @${MKDIR} ${STAGEDIR}/var/run/carbon-relay-ng @${MKDIR} ${STAGEDIR}/var/run/carbon-relay-ng/spool - ${INSTALL_PROGRAM} ${WRKSRC}/carbon-relay-ng ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/examples/carbon-relay-ng.ini ${STAGEDIR}${PREFIX}/etc/carbon-relay-ng/carbon-relay-ng.ini.sample .include Index: head/net-mgmt/carbonzipper/Makefile =================================================================== --- head/net-mgmt/carbonzipper/Makefile +++ head/net-mgmt/carbonzipper/Makefile @@ -15,42 +15,38 @@ USE_GITHUB= yes GH_ACCOUNT= go-graphite GH_SUBDIR= src/github.com/go-graphite/${PORTNAME} -GH_TUPLE= bradfitz:gomemcache:1952afa:gomemcache/src/github.com/bradfitz/gomemcache \ - dgryski:httputil:189c2918:httputil/src/github.com/dgryski/httputil \ - dgryski:go-expirecache:743ef98:goexpirecache/src/github.com/dgryski/go-expirecache \ - facebookgo:atomicfile:2de1f20:atomicfile/src/github.com/facebookgo/atomicfile \ - facebookgo:clock:600d898:clock/src/github.com/facebookgo/clock \ - facebookgo:grace:4afe952:grace/src/github.com/facebookgo/grace \ - facebookgo:httpdown:a3b1354:httpdown/src/github.com/facebookgo/httpdown \ - facebookgo:pidfile:f242e299:pidfile/src/github.com/facebookgo/pidfile \ - facebookgo:stats:1b76add:stats/src/github.com/facebookgo/stats \ - gogo:protobuf:v0.4:protobuf/src/github.com/gogo/protobuf \ - go-yaml:yaml:v2.1.1:yaml/src/gopkg.in/yaml.v2 \ - lestrrat:go-strftime:04ef93e:gostrftime/src/github.com/lestrrat/go-strftime \ - lestrrat-go:file-rotatelogs:v2.1.0:filerotatelogs/src/github.com/lestrrat/go-file-rotatelogs \ - lomik:og-rek:628eefe:ogrek/src/github.com/lomik/og-rek \ - lomik:zapwriter:d4499a3:zapwriter/src/github.com/lomik/zapwriter \ - peterbourgon:g2g:0c2bab2:g2g/src/github.com/peterbourgon/g2g \ - pkg:errors:v0.8.0:errors/src/github.com/pkg/errors \ - satori:go.uuid:v1.1.0:gouuid/src/github.com/satori/go.uuid \ - uber-go:atomic:v1.2.0:atomic/src/go.uber.org/atomic \ - uber-go:multierr:v1.1.0:multierr/src/go.uber.org/multierr \ - uber-go:zap:v1.5.0:zap/src/go.uber.org/zap +GH_TUPLE= bradfitz:gomemcache:1952afa:gomemcache/vendor/github.com/bradfitz/gomemcache \ + dgryski:httputil:189c2918:httputil/vendor/github.com/dgryski/httputil \ + dgryski:go-expirecache:743ef98:goexpirecache/vendor/github.com/dgryski/go-expirecache \ + facebookgo:atomicfile:2de1f20:atomicfile/vendor/github.com/facebookgo/atomicfile \ + facebookgo:clock:600d898:clock/vendor/github.com/facebookgo/clock \ + facebookgo:grace:4afe952:grace/vendor/github.com/facebookgo/grace \ + facebookgo:httpdown:a3b1354:httpdown/vendor/github.com/facebookgo/httpdown \ + facebookgo:pidfile:f242e299:pidfile/vendor/github.com/facebookgo/pidfile \ + facebookgo:stats:1b76add:stats/vendor/github.com/facebookgo/stats \ + gogo:protobuf:v0.4:protobuf/vendor/github.com/gogo/protobuf \ + go-yaml:yaml:v2.1.1:yaml/vendor/gopkg.in/yaml.v2 \ + lestrrat:go-strftime:04ef93e:gostrftime/vendor/github.com/lestrrat/go-strftime \ + lestrrat-go:file-rotatelogs:v2.1.0:filerotatelogs/vendor/github.com/lestrrat/go-file-rotatelogs \ + lomik:og-rek:628eefe:ogrek/vendor/github.com/lomik/og-rek \ + lomik:zapwriter:d4499a3:zapwriter/vendor/github.com/lomik/zapwriter \ + peterbourgon:g2g:0c2bab2:g2g/vendor/github.com/peterbourgon/g2g \ + pkg:errors:v0.8.0:errors/vendor/github.com/pkg/errors \ + satori:go.uuid:v1.1.0:gouuid/vendor/github.com/satori/go.uuid \ + uber-go:atomic:v1.2.0:atomic/vendor/go.uber.org/atomic \ + uber-go:multierr:v1.1.0:multierr/vendor/go.uber.org/multierr \ + uber-go:zap:v1.5.0:zap/vendor/go.uber.org/zap +GO_BUILDFLAGS= -ldflags='-X main.BuildVersion=${DISTVERSION}' + USE_RC_SUBR= ${PORTNAME} USERS= carbon GROUPS= carbon -do-build: - @cd ${WRKSRC}/ && \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} \ - go build --ldflags '-X main.BuildVersion=${DISTVERSION}' -o carbonzipper - -do-install: +post-install: @${MKDIR} ${STAGEDIR}/${PREFIX}/etc/carbonzipper @${MKDIR} ${STAGEDIR}/var/log/carbonzipper - ${INSTALL_PROGRAM} ${WRKSRC}/carbonzipper ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/example.conf ${STAGEDIR}${PREFIX}/etc/carbonzipper .include Index: head/net-mgmt/grok_exporter/Makefile =================================================================== --- head/net-mgmt/grok_exporter/Makefile +++ head/net-mgmt/grok_exporter/Makefile @@ -28,12 +28,10 @@ USE_RC_SUBR= grok_exporter SUB_FILES= config.yml -do-build: +post-patch: ${LN} -sf ${WRKSRC}/tailer/fileTailer_darwin.go ${WRKSRC}/tailer/fileTailer_freebsd.go - @(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build -o ${PORTNAME} .) -do-install: - ${INSTALL_PROGRAM} ${GO_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/config.yml ${STAGEDIR}${ETCDIR} @(cd ${WRKSRC} && ${COPYTREE_SHARE} example ${STAGEDIR}${DATADIR}) Index: head/net-mgmt/intel-snap/Makefile =================================================================== --- head/net-mgmt/intel-snap/Makefile +++ head/net-mgmt/intel-snap/Makefile @@ -17,50 +17,38 @@ GH_PROJECT= snap-freebsd GH_TAGNAME= ca8016d -GH_TUPLE= Sirupsen:logrus:61e43dc:logrus/src/github.com/Sirupsen/logrus \ - vrischmann:jsonutil:d44b59f:jsonutil/src/github.com/vrischmann/jsonutil \ - golang:crypto:f18420e:crypto/src/golang.org/x/crypto \ - appc:spec:e99880c:schema/src/github.com/appc/spec \ - asaskevich:govalidator:fdf1978:govalidator/src/github.com/asaskevich/govalidator \ - coreos:go-semver:9474efc:semver/src/github.com/coreos/go-semver \ - ghodss:yaml:04f3134:yaml/src/github.com/ghodss/yaml \ - golang:protobuf:8ee7999:protobuf/src/github.com/golang/protobuf \ - hashicorp:go-msgpack:fa3f638:msgpack/src/github.com/hashicorp/go-msgpack \ - hashicorp:memberlist:9888dc5:memberlist/src/github.com/hashicorp/memberlist \ - armon:go-metrics:06b6099:metrics/src/github.com/armon/go-metrics \ - intelsdi-x:gomit:db68f6f:gomit/src/github.com/intelsdi-x/gomit \ - julienschmidt:httprouter:8a45e95:httprouter/src/github.com/julienschmidt/httprouter \ - robfig:cron:9585fd5:cron/src/github.com/robfig/cron \ - urfave:cli:347a988:cli2/src/github.com/urfave/cli \ - urfave:negroni:61dbefc:negroni/src/github.com/urfave/negroni \ - pborman:uuid:1b00554:uuid/src/github.com/pborman/uuid \ - spf13:pflag:9ff6c69:pflag/src/github.com/spf13/pflag \ - xeipuuv:gojsonschema:f06f290:gojsonschema/src/github.com/xeipuuv/gojsonschema \ - xeipuuv:gojsonreference:e02fc20:gojsonreference/src/github.com/xeipuuv/gojsonreference \ - xeipuuv:gojsonpointer:e0fe6f6:gojsonpointer/src/github.com/xeipuuv/gojsonpointer \ - golang:net:41bba8d:net/src/golang.org/x/net \ - abh:errorutil:f9bd360:errorutil/src/go4.org/errorutil \ - go-yaml:yaml:4c78c97:yaml2/src/gopkg.in/yaml.v2 \ - go-inf:inf:3887ee9:inf/src/gopkg.in/inf.v0 \ - grpc:grpc-go:b1efb1e:grpc/src/google.golang.org/grpc \ - ghodss:yaml:04f3134:yaml/src/github.com/ghodss/yaml +GH_TUPLE= Sirupsen:logrus:61e43dc:logrus/vendor/github.com/Sirupsen/logrus \ + vrischmann:jsonutil:d44b59f:jsonutil/vendor/github.com/vrischmann/jsonutil \ + golang:crypto:f18420e:crypto/vendor/golang.org/x/crypto \ + appc:spec:e99880c:schema/vendor/github.com/appc/spec \ + asaskevich:govalidator:fdf1978:govalidator/vendor/github.com/asaskevich/govalidator \ + coreos:go-semver:9474efc:semver/vendor/github.com/coreos/go-semver \ + ghodss:yaml:04f3134:yaml/vendor/github.com/ghodss/yaml \ + golang:protobuf:8ee7999:protobuf/vendor/github.com/golang/protobuf \ + hashicorp:go-msgpack:fa3f638:msgpack/vendor/github.com/hashicorp/go-msgpack \ + hashicorp:memberlist:9888dc5:memberlist/vendor/github.com/hashicorp/memberlist \ + armon:go-metrics:06b6099:metrics/vendor/github.com/armon/go-metrics \ + intelsdi-x:gomit:db68f6f:gomit/vendor/github.com/intelsdi-x/gomit \ + julienschmidt:httprouter:8a45e95:httprouter/vendor/github.com/julienschmidt/httprouter \ + robfig:cron:9585fd5:cron/vendor/github.com/robfig/cron \ + urfave:cli:347a988:cli2/vendor/github.com/urfave/cli \ + urfave:negroni:61dbefc:negroni/vendor/github.com/urfave/negroni \ + pborman:uuid:1b00554:uuid/vendor/github.com/pborman/uuid \ + spf13:pflag:9ff6c69:pflag/vendor/github.com/spf13/pflag \ + xeipuuv:gojsonschema:f06f290:gojsonschema/vendor/github.com/xeipuuv/gojsonschema \ + xeipuuv:gojsonreference:e02fc20:gojsonreference/vendor/github.com/xeipuuv/gojsonreference \ + xeipuuv:gojsonpointer:e0fe6f6:gojsonpointer/vendor/github.com/xeipuuv/gojsonpointer \ + golang:net:41bba8d:net/vendor/golang.org/x/net \ + abh:errorutil:f9bd360:errorutil/vendor/go4.org/errorutil \ + go-yaml:yaml:4c78c97:yaml2/vendor/gopkg.in/yaml.v2 \ + go-inf:inf:3887ee9:inf/vendor/gopkg.in/inf.v0 \ + grpc:grpc-go:b1efb1e:grpc/vendor/google.golang.org/grpc \ + ghodss:yaml:04f3134:yaml/vendor/github.com/ghodss/yaml -PLIST_FILES= bin/snapctl bin/snapd +GO_PKGNAME= github.com/intelsdi-x/snap +GO_TARGET= .:snapd \ + ./cmd/snapctl -do-build: - ( cd ${WRKSRC}; ${LN} -s ${WRKSRC} ${WRKSRC}/src/github.com/intelsdi-x/snap ) - ( cd ${WRKSRC}/src/github.com/appc/spec; \ - ${SETENV} ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} CC=clang \ - go build -o bin/actool github.com/appc/spec/actool ) - ( cd ${WRKSRC}; \ - ${SETENV} ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} CC=clang \ - go build ${BUILD_FLAGS} -o bin/snapd ) - ( cd ${WRKSRC}/cmd/snapctl; \ - ${SETENV} ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} CC=clang \ - go build ${BUILD_FLAGS} -o bin/snapctl ) - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cmd/snapctl/bin/snapctl ${STAGEDIR}${PREFIX}/bin/snapctl - ${INSTALL_PROGRAM} ${WRKSRC}/bin/snapd ${STAGEDIR}${PREFIX}/bin/snapd +PLIST_FILES= bin/snapctl bin/snapd .include Index: head/net-mgmt/kapacitor/Makefile =================================================================== --- head/net-mgmt/kapacitor/Makefile +++ head/net-mgmt/kapacitor/Makefile @@ -23,6 +23,10 @@ GH_ACCOUNT= influxdata GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} +GO_BUILDFLAGS+= -ldflags "-X main.version=${DISTVERSION}" +GO_TARGET= ./cmd/kapacitor \ + ./cmd/kapacitord + SUB_FILES= kapacitord SUB_LIST+= KAPACITORD_USER=${KAPACITORD_USER} \ KAPACITORD_GROUP=${KAPACITORD_GROUP} \ @@ -52,21 +56,14 @@ KAPACITORD_DBDIR= /var/db/${PORTNAME}/ KAPACITORD_LOGDIR= /var/log/${PORTNAME}/ -do-build: - @cd ${WRKSRC}/src/github.com/influxdata/${PORTNAME} \ - && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/${PORTNAME} \ - && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/${PORTNAME}d - -do-install: +post-install: ${MKDIR} ${STAGEDIR}${KAPACITORD_DBDIR} \ ${STAGEDIR}${KAPACITORD_LOGDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME}d ${STAGEDIR}${PREFIX}/bin/${PORTNAME}d @${SED} -i .bak -e \ "s|/var/lib/kapacitor|/var/db/kapacitor|g" \ - ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/etc/${PORTNAME}/${PORTNAME}.conf + ${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf ${INSTALL_DATA} \ - ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/etc/${PORTNAME}/${PORTNAME}.conf \ + ${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf \ ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample .include Index: head/net-mgmt/mysqld_exporter/Makefile =================================================================== --- head/net-mgmt/mysqld_exporter/Makefile +++ head/net-mgmt/mysqld_exporter/Makefile @@ -17,13 +17,9 @@ GH_ACCOUNT= prometheus GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} -GO_TARGET= github.com/${GH_ACCOUNT}/${PORTNAME} PLIST_FILES= bin/mysqld_exporter USE_RC_SUBR= mysqld_exporter - -do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/bin/mysqld_exporter ${STAGEDIR}${PREFIX}/bin .include Index: head/net-mgmt/nsd_exporter/Makefile =================================================================== --- head/net-mgmt/nsd_exporter/Makefile +++ head/net-mgmt/nsd_exporter/Makefile @@ -15,18 +15,17 @@ USE_GITHUB= yes GH_ACCOUNT= optix2000 -GH_TUPLE= prometheus:client_golang:v0.8.0:client_golang \ - prometheus:client_model:5c3871d:client_model \ - prometheus:procfs:ae68e2d:procfs \ - prometheus:common:7600349:common \ - beorn7:perks:3a771d9:perks \ - golang:protobuf:70b3af3:protobuf \ - matttproud:golang_protobuf_extensions:c12348c:golang_protobuf_extensions \ - optix2000:go-nsdctl:ce14b32:go_nsdctl \ - go-yaml:yaml:7f97868:go_yaml +GH_TUPLE= prometheus:client_golang:v0.8.0:client_golang/vendor/github.com/prometheus/client_golang \ + prometheus:client_model:5c3871d:client_model/vendor/github.com/prometheus/client_model \ + prometheus:procfs:ae68e2d:procfs/vendor/github.com/prometheus/procfs \ + prometheus:common:7600349:common/vendor/github.com/prometheus/common \ + beorn7:perks:3a771d9:perks/vendor/github.com/beorn7/perks \ + golang:protobuf:70b3af3:protobuf/vendor/github.com/golang/protobuf \ + matttproud:golang_protobuf_extensions:c12348c:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ + optix2000:go-nsdctl:ce14b32:go_nsdctl/vendor/github.com/optix2000/go-nsdctl \ + go-yaml:yaml:7f97868:go_yaml/vendor/gopkg.in/yaml.v2 GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} -GO_TARGET= github.com/${GH_ACCOUNT}/${PORTNAME} PLIST_FILES= bin/nsd_exporter @@ -35,22 +34,5 @@ post-patch: ${REINPLACE_CMD} -e 's|"/etc|"${LOCALBASE}/etc|g' ${WRKSRC_go_nsdctl}/nsdctl.go ${REINPLACE_CMD} -e 's|"/etc|"${LOCALBASE}/etc|g' ${WRKSRC}/nsd_exporter.go - -pre-build: - ${MKDIR} ${GO_WRKDIR_SRC}/github.com/prometheus ${GO_WRKDIR_SRC}/gopkg.in \ - ${GO_WRKDIR_SRC}/github.com/beorn7 ${GO_WRKDIR_SRC}/github.com/golang \ - ${GO_WRKDIR_SRC}/github.com/matttproud ${GO_WRKDIR_SRC}/github.com/optix2000 - ${MV} ${WRKSRC_golang_protobuf_extensions} ${GO_WRKDIR_SRC}/github.com/matttproud/golang_protobuf_extensions - ${MV} ${WRKSRC_go_nsdctl} ${GO_WRKDIR_SRC}/github.com/optix2000/go-nsdctl - ${MV} ${WRKSRC_client_golang} ${GO_WRKDIR_SRC}/github.com/prometheus/client_golang - ${MV} ${WRKSRC_client_model} ${GO_WRKDIR_SRC}/github.com/prometheus/client_model - ${MV} ${WRKSRC_procfs} ${GO_WRKDIR_SRC}/github.com/prometheus/procfs - ${MV} ${WRKSRC_common} ${GO_WRKDIR_SRC}/github.com/prometheus/common - ${MV} ${WRKSRC_protobuf} ${GO_WRKDIR_SRC}/github.com/golang/protobuf - ${MV} ${WRKSRC_go_yaml} ${GO_WRKDIR_SRC}/gopkg.in/yaml.v2 - ${MV} ${WRKSRC_perks} ${GO_WRKDIR_SRC}/github.com/beorn7/perks - -do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/bin/nsd_exporter ${STAGEDIR}${PREFIX}/bin .include Index: head/net-mgmt/prometheus1/Makefile =================================================================== --- head/net-mgmt/prometheus1/Makefile +++ head/net-mgmt/prometheus1/Makefile @@ -14,7 +14,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go gmake +USES= go USE_GITHUB= yes GO_PKGNAME= github.com/${PORTNAME}/${PORTNAME} @@ -26,24 +26,17 @@ BUILD_USER?= ${USER} LD_FLAG_X_PREFIX= -X ${GO_PKGNAME}/vendor/github.com/prometheus/common/version -LD_FLAG_STRING= -s \ - ${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \ - ${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \ - ${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \ - ${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER} +GO_BUILDFLAGS= -ldflags "\ + -s \ + ${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \ + ${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \ + ${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \ + ${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER}" +GO_TARGET= ./cmd/prometheus \ + ./cmd/promtool -do-build: - ( cd ${GO_WRKSRC}/cmd/prometheus ; \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) - - ( cd ${GO_WRKSRC}/cmd/promtool ; \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) - -do-install: - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/prometheus ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/promtool ${STAGEDIR}${PREFIX}/bin +post-install: ${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml ${STAGEDIR}${LOCALBASE}/etc/prometheus.yml.sample - ${MKDIR} ${STAGEDIR}${DESTDIR}/var/db/prometheus .include Index: head/net-mgmt/semaphore/Makefile =================================================================== --- head/net-mgmt/semaphore/Makefile +++ head/net-mgmt/semaphore/Makefile @@ -18,50 +18,51 @@ USE_GITHUB= yes USE_RC_SUBR= semaphore -GO_TARGET= github.com/${GH_ACCOUNT}/${PORTNAME} +GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} +GO_TARGET= ./cli:${PORTNAME} GH_ACCOUNT= ansible-semaphore -GH_TUPLE= ansible-semaphore:semaphore-vendor:a44f7be:ansible/github.com/ansible-semaphore/semaphore-vendor \ - PuerkitoBio:purell:v1.1.0:PuerkitoBio/github.com/PuerkitoBio/purell \ - PuerkitoBio:urlesc:de5bf2a:PuerkitoBio2/github.com/PuerkitoBio/urlesc \ - Sirupsen:logrus:v1.0.4:Sirupsen/github.com/Sirupsen/logrus \ - asaskevich:govalidator:v9:asaskevich/github.com/asaskevich/govalidator \ - castawaylabs:mulekick:7029fb3:castawaylabs/github.com/castawaylabs/mulekick \ - go-openapi:analysis:f59a71f:openapi/github.com/go-openapi/analysis \ - go-openapi:errors:7bcb96a:openapi2/github.com/go-openapi/errors \ - go-openapi:jsonpointer:3a0015a:openapi3/github.com/go-openapi/jsonpointer \ - go-openapi:jsonreference:3fb327e:openapi4/github.com/go-openapi/jsonreference \ - go-openapi:loads:2a2b323:openapi5/github.com/go-openapi/loads \ - go-openapi:runtime:62281b6:openapi6/github.com/go-openapi/runtime \ - go-openapi:spec:370d9e0:openapi7/github.com/go-openapi/spec \ - go-openapi:strfmt:4818084:openapi8/github.com/go-openapi/strfmt \ - go-openapi:swag:811b108:openapi9/github.com/go-openapi/swag \ - go-openapi:validate:180bba5:openapi10/github.com/go-openapi/validate \ - go-sql-driver:mysql:v1.3:sqldriver/github.com/go-sql-driver/mysql \ - gobuffalo:packr:v1.10.4:buffalo/github.com/gobuffalo/packr \ - google:go-github:v15.0.0:google/github.com/google/go-github \ - google:go-querystring:53e6ce1:google2/github.com/google/go-querystring \ - gorilla:context:v1.1:gorilla/github.com/gorilla/context \ - gorilla:handlers:v1.3.0:gorilla2/github.com/gorilla/handlers \ - gorilla:mux:v1.6.1:gorilla3/github.com/gorilla/mux \ - gorilla:securecookie:v1.1.1:gorilla4/github.com/gorilla/securecookie \ - gorilla:websocket:v1.2.0:gorilla5/github.com/gorilla/websocket \ - lann:builder:1b87b36:lann/github.com/lann/builder \ - lann:ps:62de8c4:lann2/github.com/lann/ps \ - mailru:easyjson:8b799c4:mailru/github.com/mailru/easyjson \ - masterminds:squirrel:v1.0:mastermindos/github.com/masterminds/squirrel \ - mitchellh:mapstructure:00c29f5:mitchellh/github.com/mitchellh/mapstructure \ - pkg:errors:v0.8.0:pkg/github.com/pkg/errors \ - russross:blackfriday:v1.5.1:russross/github.com/russross/blackfriday \ - golang:net:61147c4:golang/golang.org/x/net \ - golang:sys:7dca6fe:golang2/golang.org/x/sys \ - golang:text:v0.3.0:golang3/golang.org/x/text \ - golang:crypto:c7dcf10:golang4/golang.org/x/crypto \ - go-asn1-ber:asn1-ber:v1.2:pkgin/gopkg.in/asn1-ber.v1 \ - go-gorp:gorp:v1.7.1:pkgin2/gopkg.in/gorp.v1 \ - go-ldap:ldap:v2.5.1:pkgin3/gopkg.in/ldap.v2 \ - go-mgo:mgo:3f83fa5:pkgin4/gopkg.in/mgo.v2 \ - go-yaml:yaml:v2.2.1:pkgin5/gopkg.in/yaml.v2 +GH_TUPLE= ansible-semaphore:semaphore-vendor:a44f7be:ansible/vendor/github.com/ansible-semaphore/semaphore-vendor \ + PuerkitoBio:purell:v1.1.0:PuerkitoBio/vendor/github.com/PuerkitoBio/purell \ + PuerkitoBio:urlesc:de5bf2a:PuerkitoBio2/vendor/github.com/PuerkitoBio/urlesc \ + Sirupsen:logrus:v1.0.4:Sirupsen/vendor/github.com/Sirupsen/logrus \ + asaskevich:govalidator:v9:asaskevich/vendor/github.com/asaskevich/govalidator \ + castawaylabs:mulekick:7029fb3:castawaylabs/vendor/github.com/castawaylabs/mulekick \ + go-openapi:analysis:f59a71f:openapi/vendor/github.com/go-openapi/analysis \ + go-openapi:errors:7bcb96a:openapi2/vendor/github.com/go-openapi/errors \ + go-openapi:jsonpointer:3a0015a:openapi3/vendor/github.com/go-openapi/jsonpointer \ + go-openapi:jsonreference:3fb327e:openapi4/vendor/github.com/go-openapi/jsonreference \ + go-openapi:loads:2a2b323:openapi5/vendor/github.com/go-openapi/loads \ + go-openapi:runtime:62281b6:openapi6/vendor/github.com/go-openapi/runtime \ + go-openapi:spec:370d9e0:openapi7/vendor/github.com/go-openapi/spec \ + go-openapi:strfmt:4818084:openapi8/vendor/github.com/go-openapi/strfmt \ + go-openapi:swag:811b108:openapi9/vendor/github.com/go-openapi/swag \ + go-openapi:validate:180bba5:openapi10/vendor/github.com/go-openapi/validate \ + go-sql-driver:mysql:v1.3:sqldriver/vendor/github.com/go-sql-driver/mysql \ + gobuffalo:packr:v1.10.4:buffalo/vendor/github.com/gobuffalo/packr \ + google:go-github:v15.0.0:google/vendor/github.com/google/go-github \ + google:go-querystring:53e6ce1:google2/vendor/github.com/google/go-querystring \ + gorilla:context:v1.1:gorilla/vendor/github.com/gorilla/context \ + gorilla:handlers:v1.3.0:gorilla2/vendor/github.com/gorilla/handlers \ + gorilla:mux:v1.6.1:gorilla3/vendor/github.com/gorilla/mux \ + gorilla:securecookie:v1.1.1:gorilla4/vendor/github.com/gorilla/securecookie \ + gorilla:websocket:v1.2.0:gorilla5/vendor/github.com/gorilla/websocket \ + lann:builder:1b87b36:lann/vendor/github.com/lann/builder \ + lann:ps:62de8c4:lann2/vendor/github.com/lann/ps \ + mailru:easyjson:8b799c4:mailru/vendor/github.com/mailru/easyjson \ + masterminds:squirrel:v1.0:mastermindos/vendor/github.com/masterminds/squirrel \ + mitchellh:mapstructure:00c29f5:mitchellh/vendor/github.com/mitchellh/mapstructure \ + pkg:errors:v0.8.0:pkg/vendor/github.com/pkg/errors \ + russross:blackfriday:v1.5.1:russross/vendor/github.com/russross/blackfriday \ + golang:net:61147c4:golang/vendor/golang.org/x/net \ + golang:sys:7dca6fe:golang2/vendor/golang.org/x/sys \ + golang:text:v0.3.0:golang3/vendor/golang.org/x/text \ + golang:crypto:c7dcf10:golang4/vendor/golang.org/x/crypto \ + go-asn1-ber:asn1-ber:v1.2:pkgin/vendor/gopkg.in/asn1-ber.v1 \ + go-gorp:gorp:v1.7.1:pkgin2/vendor/gopkg.in/gorp.v1 \ + go-ldap:ldap:v2.5.1:pkgin3/vendor/gopkg.in/ldap.v2 \ + go-mgo:mgo:3f83fa5:pkgin4/vendor/gopkg.in/mgo.v2 \ + go-yaml:yaml:v2.2.1:pkgin5/vendor/gopkg.in/yaml.v2 OPTIONS_DEFINE= MYSQL MYSQL_USES= mysql @@ -70,18 +71,7 @@ ${REINPLACE_CMD} 's/%%PORTVERSION%%/${PORTVERSION}/g' \ ${WRKSRC}/util/config.go -do-build: - ${MKDIR} ${WRKSRC}/${GO_TARGET:H} - ${MKDIR} ${WRKSRC}/public - ${RLN} ${WRKSRC} ${WRKSRC}/${GO_TARGET} - ${RLN} ${WRKSRC} ${GO_WRKSRC}/src - ${RLN} ${WRKSRC} ${GO_WRKSRC}/public/vendor - (cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} ${GO_CMD} \ - build ${GO_BUILDFLAGS} -o ${WRKSRC}/bin/${PORTNAME} cli) - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin +post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/semaphore ${CP} ${WRKSRC}/config.json ${STAGEDIR}${PREFIX}/etc/semaphore/semaphore_config.json.sample Index: head/net-mgmt/telegraf/Makefile =================================================================== --- head/net-mgmt/telegraf/Makefile +++ head/net-mgmt/telegraf/Makefile @@ -21,151 +21,154 @@ GH_ACCOUNT= influxdata GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT_DEFAULT} -GH_TUPLE= GoogleCloudPlatform:google-cloud-go:v0.27.0:go/src/cloud.google.com/go \ - cloudfoundry:clock:02e53af:clock/src/code.cloudfoundry.org/clock \ - collectd:go-collectd:v0.3.0:collectd_org/src/collectd.org \ - census-ecosystem:opencensus-go-exporter-stackdriver:v0.6.0:census_ecosystem/src/contrib.go.opencensus.io/exporter/stackdriver \ - cisco-ie:nx-telemetry-proto:82441e2:nx_telemetry_proto/src/github.com/cisco-ie/nx-telemetry-proto \ - Azure:go-autorest:v10.12.0:go_autorest/src/github.com/Azure/go-autorest \ - Microsoft:ApplicationInsights-Go:d2df5d4:application_insights/src/github.com/Microsoft/ApplicationInsights-Go \ - Microsoft:go-winio:v0.4.9:go_winio/src/github.com/Microsoft/go-winio \ - influxdata:sarama:b12709e:sarama/src/github.com/Shopify/sarama \ - StackExchange:wmi:1.0.0:wmi/src/github.com/StackExchange/wmi \ - aerospike:aerospike-client-go:v1.27.0:aerospike_client_go/src/github.com/aerospike/aerospike-client-go \ - alecthomas:units:2efee85:units/src/github.com/alecthomas/units \ - amir:raidman:1ccc43b:raidman/src/github.com/amir/raidman \ - apache:thrift:f2867c2:thrift/src/github.com/apache/thrift \ - aws:aws-sdk-go:v1.19.41:aws_sdk_go/src/github.com/aws/aws-sdk-go \ - beorn7:perks:3a771d9:perks/src/github.com/beorn7/perks \ - caio:go-tdigest:v2.3.0:go_tdigest/src/github.com/caio/go-tdigest \ - cenkalti:backoff:v2.0.0:backoff/src/github.com/cenkalti/backoff \ - couchbase:go-couchbase:16db1f1:go_couchbase/src/github.com/couchbase/go-couchbase \ - couchbase:gomemcached:0da75df:gomemcached/src/github.com/couchbase/gomemcached \ - couchbase:goutils:e865a14:goutils/src/github.com/couchbase/goutils \ - davecgh:go-spew:v1.1.0:go_spew/src/github.com/davecgh/go-spew \ - denisenkom:go-mssqldb:2be1aa5:go_mssqldb/src/github.com/denisenkom/go-mssqldb \ - dgrijalva:jwt-go:v3.2.0:jwt_go/src/github.com/dgrijalva/jwt-go \ - dimchansky:utfbom:6c6132f:utfbom/src/github.com/dimchansky/utfbom \ - docker:distribution:edc3ab2:distribution/src/github.com/docker/distribution \ - moby:moby:ed7b642:docker/src/github.com/docker/docker \ - docker:go-connections:v0.3.0:go_connections/src/github.com/docker/go-connections \ - docker:go-units:v0.3.3:go_units/src/github.com/docker/go-units \ - docker:libnetwork:d7b6174:libnetwork/src/github.com/docker/libnetwork \ - eapache:go-resiliency:v1.1.0:go_resiliency/src/github.com/eapache/go-resiliency \ - eapache:go-xerial-snappy:040cc1a:go_xerial_snappy/src/github.com/eapache/go-xerial-snappy \ - eapache:queue:v1.1.0:queue/src/github.com/eapache/queue \ - eclipse:paho.mqtt.golang:v1.1.1:paho_mqtt_golang/src/github.com/eclipse/paho.mqtt.golang \ - ericchiang:k8s:v1.2.0:k8s/src/github.com/ericchiang/k8s \ - ghodss:yaml:25d852a:yaml/src/github.com/ghodss/yaml \ - go-logfmt:logfmt:v0.4.0:go_logfmt/src/github.com/go-logfmt/logfmt \ - go-ole:go-ole:v1.2.1:go_ole/src/github.com/go-ole/go-ole \ - go-redis:redis:v6.12.0:redis/src/github.com/go-redis/redis \ - go-sql-driver:mysql:v1.4.1:mysql/src/github.com/go-sql-driver/mysql \ - gobwas:glob:v0.2.3:glob/src/github.com/gobwas/glob \ - gogo:protobuf:v1.1.1:gogo_protobuf/src/github.com/gogo/protobuf \ - golang:protobuf:v1.1.0:protobuf/src/github.com/golang/protobuf \ - golang:snappy:2e65f85:snappy/src/github.com/golang/snappy \ - google:go-github:v24.0.1:go_github/src/github.com/google/go-github \ - google:go-cmp:v0.2.0:go_cmp/src/github.com/google/go-cmp \ - google:go-querystring:v1.0.0:go_querystring/src/github.com/google/go-querystring \ - google:uuid:0.2:uuid/src/github.com/google/uuid \ - googleapis:gax-go:v2.0.0:gax_go/src/github.com/googleapis/gax-go \ - gorilla:context:v1.1.1:context/src/github.com/gorilla/context \ - gorilla:mux:v1.6.2:mux/src/github.com/gorilla/mux \ - hailocab:go-hostpool:e80d13c:go_hostpool/src/github.com/hailocab/go-hostpool \ - harlow:kinesis-consumer:2f58b13:kinesis_consumer/src/github.com/harlow/kinesis-consumer \ - hashicorp:consul:v1.2.1:consul/src/github.com/hashicorp/consul \ - hashicorp:go-cleanhttp:d5fe4b5:go_cleanhttp/src/github.com/hashicorp/go-cleanhttp \ - hashicorp:go-rootcerts:6bb64b3:go_rootcerts/src/github.com/hashicorp/go-rootcerts \ - hashicorp:go-uuid:v1.0.1:gouuid/src/github.com/hashicorp/go-uuid \ - hashicorp:serf:v0.8.1:serf/src/github.com/hashicorp/serf \ - influxdata:go-syslog:v2.0.0:go_syslog/src/github.com/influxdata/go-syslog \ - influxdata:tail:c434825:tail/src/github.com/influxdata/tail \ - influxdata:toml:270119a:toml/src/github.com/influxdata/toml \ - influxdata:wlog:7c63b0a:wlog/src/github.com/influxdata/wlog \ - jackc:pgx:v3.2.0:pgx/src/github.com/jackc/pgx \ - jcmturner:aescts:v1.0.1:aescts/src/gopkg.in/jcmturner/aescts.v1 \ - jcmturner:dnsutils:v1.0.1:dnsutils/src/gopkg.in/jcmturner/dnsutils.v1 \ - jcmturner:gofork:v1.0.0:gofork/src/github.com/jcmturner/gofork \ - jcmturner:gokrb5:v7.3.0:gokrb5/src/gopkg.in/jcmturner/gokrb5.v7 \ - jcmturner:rpc:v1.1.0:rpc/src/gopkg.in/jcmturner/rpc.v1 \ - jmespath:go-jmespath:c2b33e84:go_jmespath/src/github.com/jmespath/go-jmespath \ - kardianos:osext:ae77be6:osext/src/github.com/kardianos/osext \ - kardianos:service:615a14e:service/src/github.com/kardianos/service \ - karrick:godirwalk:v1.7.5:godirwalk/src/github.com/karrick/godirwalk \ - kballard:go-shellquote:95032a8:go_shellquote/src/github.com/kballard/go-shellquote \ - kr:logfmt:b84e30a:logfmt/src/github.com/kr/logfmt \ - kubernetes:apimachinery:d41becf:apimachinery/src/github.com/kubernetes/apimachinery \ - leodido:ragel-machinery:299bdde:ragel_machinery/src/github.com/leodido/ragel-machinery \ - mailru:easyjson:efc7eb8:easyjson/src/github.com/mailru/easyjson \ - matttproud:golang_protobuf_extensions:v1.0.1:golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions \ - mdlayher:apcupsd:2fe55d9:apcupsd/src/github.com/mdlayher/apcupsd \ - miekg:dns:v1.0.8:dns/src/github.com/miekg/dns \ - mitchellh:go-homedir:3864e76:go_homedir/src/github.com/mitchellh/go-homedir \ - mitchellh:mapstructure:f15292f:mapstructure/src/github.com/mitchellh/mapstructure \ - multiplay:go-ts3:v1.0.0:go_ts3/src/github.com/multiplay/go-ts3 \ - naoina:go-stringutil:v0.1.0:go_stringutil/src/github.com/naoina/go-stringutil \ - nats-io:gnatsd:v1.2.0:gnatsd/src/github.com/nats-io/gnatsd \ - nats-io:go-nats:v1.5.0:nats/src/github.com/nats-io/go-nats \ - nats-io:nuid:v1.0.0:nuid/src/github.com/nats-io/nuid \ - nsqio:go-nsq:v1.0.7:go_nsq/src/github.com/nsqio/go-nsq \ - openconfig:gnmi:33a1865:gnmi/src/github.com/openconfig/gnmi \ - opencontainers:go-digest:v1.0.0-rc1:go_digest/src/github.com/opencontainers/go-digest \ - opencontainers:image-spec:v1.0.1:image_spec/src/github.com/opencontainers/image-spec \ - opentracing-contrib:go-observer:a52f234:go_observer/src/github.com/opentracing-contrib/go-observer \ - opentracing:opentracing-go:v1.0.2:opentracing_go/src/github.com/opentracing/opentracing-go \ - openzipkin:zipkin-go-opentracing:v0.3.4:zipkin_go_opentracing/src/github.com/openzipkin/zipkin-go-opentracing \ - glinton:ping:v0.1.1:ping/src/github.com/glinton/ping \ - pierrec:lz4:v2.0.3:lz4/src/github.com/pierrec/lz4 \ - pkg:errors:v0.8.0:errors/src/github.com/pkg/errors \ - pmezard:go-difflib:v1.0.0:go_difflib/src/github.com/pmezard/go-difflib \ - prometheus:client_golang:v0.9.2:client_golang/src/github.com/prometheus/client_golang \ - prometheus:client_model:5c3871d:client_model/src/github.com/prometheus/client_model \ - prometheus:common:7600349:common/src/github.com/prometheus/common \ - prometheus:procfs:ae68e2d:procfs/src/github.com/prometheus/procfs \ - rcrowley:go-metrics:e2704e1:go_metrics/src/github.com/rcrowley/go-metrics \ - samuel:go-zookeeper:c4fab1a:go_zookeeper/src/github.com/samuel/go-zookeeper \ - satori:go.uuid:v1.2.0:go_uuid/src/github.com/satori/go.uuid \ - shirou:gopsutil:v2.19.7:gopsutil/src/github.com/shirou/gopsutil \ - shirou:w32:bb4de01:w32/src/github.com/shirou/w32 \ - sirupsen:logrus:v1.0.5:logrus/src/github.com/sirupsen/logrus \ - soniah:gosnmp:96b8622:gosnmp/src/github.com/soniah/gosnmp \ - streadway:amqp:e5adc2a:amqp/src/github.com/streadway/amqp \ - stretchr:objx:v0.1.1:objx/src/github.com/stretchr/objx \ - stretchr:testify:v1.2.2:testify/src/github.com/stretchr/testify \ - tidwall:gjson:v1.3.0:gjson/src/github.com/tidwall/gjson \ - tidwall:match:1731857:match/src/github.com/tidwall/match \ - tidwall:pretty:v1.0.0:pretty/src/github.com/tidwall/pretty \ - vishvananda:netlink:b2de5d1:netlink/src/github.com/vishvananda/netlink \ - vishvananda:netns:13995c7:netns/src/github.com/vishvananda/netns \ - vjeantet:grok:v1.0.0:grok/src/github.com/vjeantet/grok \ - vmware:govmomi:v0.19.0:govmomi/src/github.com/vmware/govmomi \ - wavefronthq:wavefront-sdk-go:v0.9.2:wavefront_sdk_go/src/github.com/wavefronthq/wavefront-sdk-go \ - wvanbergen:kafka:e2edea9:kafka/src/github.com/wvanbergen/kafka \ - wvanbergen:kazoo-go:f72d861:kazoo_go/src/github.com/wvanbergen/kazoo-go \ - yuin:gopher-lua:46796da:gopher_lua/src/github.com/yuin/gopher-lua \ - census-instrumentation:opencensus-go:v0.17.0:opencensus_go/src/go.opencensus.io \ - golang:crypto:a214413:crypto/src/golang.org/x/crypto \ - golang:net:a680a1e:net/src/golang.org/x/net \ - golang:oauth2:d2e6202:oauth2/src/golang.org/x/oauth2 \ - golang:sync:42b3178:sync/src/golang.org/x/sync \ - golang:sys:51ab0e2:sys/src/golang.org/x/sys \ - golang:text:v0.3.0:text/src/golang.org/x/text \ - googleapis:google-api-go-client:19ff876:googleapis/src/google.golang.org/api \ - golang:appengine:v1.1.0:appengine/src/google.golang.org/appengine \ - google:go-genproto:fedd286:genproto/src/google.golang.org/genproto \ - grpc:grpc-go:v1.13.0:grpc/src/google.golang.org/grpc \ - go-asn1-ber:asn1-ber:v1.2:asn1_ber_v1/src/gopkg.in/asn1-ber.v1 \ - fatih:pool:v2.0.0:pool_v2/src/gopkg.in/fatih/pool.v2 \ - fsnotify:fsnotify:v1.4.7:fsnotify_v1/src/gopkg.in/fsnotify.v1 \ - rethinkdb:rethinkdb-go:v3.0.5:gorethink_v3/src/gopkg.in/gorethink/gorethink.v3 \ - go-inf:inf:v0.9.1:inf_v0/src/gopkg.in/inf.v0 \ - go-ldap:ldap:v2.5.1:ldap_v2/src/gopkg.in/ldap.v2 \ - go-mgo:mgo:9856a29:mgo_v2/src/gopkg.in/mgo.v2 \ - olivere:elastic:v5.0.70:elastic_v5/src/gopkg.in/olivere/elastic.v5 \ - go-tomb:tomb:dd63297:tomb_v1/src/gopkg.in/tomb.v1 \ - go-yaml:yaml:v2.2.1:yaml_v2/src/gopkg.in/yaml.v2 +GH_TUPLE= GoogleCloudPlatform:google-cloud-go:v0.27.0:go/vendor/cloud.google.com/go \ + cloudfoundry:clock:02e53af:clock/vendor/code.cloudfoundry.org/clock \ + collectd:go-collectd:v0.3.0:collectd_org/vendor/collectd.org \ + census-ecosystem:opencensus-go-exporter-stackdriver:v0.6.0:census_ecosystem/vendor/contrib.go.opencensus.io/exporter/stackdriver \ + cisco-ie:nx-telemetry-proto:82441e2:nx_telemetry_proto/vendor/github.com/cisco-ie/nx-telemetry-proto \ + Azure:go-autorest:v10.12.0:go_autorest/vendor/github.com/Azure/go-autorest \ + Microsoft:ApplicationInsights-Go:d2df5d4:application_insights/vendor/github.com/Microsoft/ApplicationInsights-Go \ + Microsoft:go-winio:v0.4.9:go_winio/vendor/github.com/Microsoft/go-winio \ + influxdata:sarama:b12709e:sarama/vendor/github.com/Shopify/sarama \ + StackExchange:wmi:1.0.0:wmi/vendor/github.com/StackExchange/wmi \ + aerospike:aerospike-client-go:v1.27.0:aerospike_client_go/vendor/github.com/aerospike/aerospike-client-go \ + alecthomas:units:2efee85:units/vendor/github.com/alecthomas/units \ + amir:raidman:1ccc43b:raidman/vendor/github.com/amir/raidman \ + apache:thrift:f2867c2:thrift/vendor/github.com/apache/thrift \ + aws:aws-sdk-go:v1.19.41:aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ + beorn7:perks:3a771d9:perks/vendor/github.com/beorn7/perks \ + caio:go-tdigest:v2.3.0:go_tdigest/vendor/github.com/caio/go-tdigest \ + cenkalti:backoff:v2.0.0:backoff/vendor/github.com/cenkalti/backoff \ + couchbase:go-couchbase:16db1f1:go_couchbase/vendor/github.com/couchbase/go-couchbase \ + couchbase:gomemcached:0da75df:gomemcached/vendor/github.com/couchbase/gomemcached \ + couchbase:goutils:e865a14:goutils/vendor/github.com/couchbase/goutils \ + davecgh:go-spew:v1.1.0:go_spew/vendor/github.com/davecgh/go-spew \ + denisenkom:go-mssqldb:2be1aa5:go_mssqldb/vendor/github.com/denisenkom/go-mssqldb \ + dgrijalva:jwt-go:v3.2.0:jwt_go/vendor/github.com/dgrijalva/jwt-go \ + dimchansky:utfbom:6c6132f:utfbom/vendor/github.com/dimchansky/utfbom \ + docker:distribution:edc3ab2:distribution/vendor/github.com/docker/distribution \ + moby:moby:ed7b642:docker/vendor/github.com/docker/docker \ + docker:go-connections:v0.3.0:go_connections/vendor/github.com/docker/go-connections \ + docker:go-units:v0.3.3:go_units/vendor/github.com/docker/go-units \ + docker:libnetwork:d7b6174:libnetwork/vendor/github.com/docker/libnetwork \ + eapache:go-resiliency:v1.1.0:go_resiliency/vendor/github.com/eapache/go-resiliency \ + eapache:go-xerial-snappy:040cc1a:go_xerial_snappy/vendor/github.com/eapache/go-xerial-snappy \ + eapache:queue:v1.1.0:queue/vendor/github.com/eapache/queue \ + eclipse:paho.mqtt.golang:v1.1.1:paho_mqtt_golang/vendor/github.com/eclipse/paho.mqtt.golang \ + ericchiang:k8s:v1.2.0:k8s/vendor/github.com/ericchiang/k8s \ + ghodss:yaml:25d852a:yaml/vendor/github.com/ghodss/yaml \ + go-logfmt:logfmt:v0.4.0:go_logfmt/vendor/github.com/go-logfmt/logfmt \ + go-ole:go-ole:v1.2.1:go_ole/vendor/github.com/go-ole/go-ole \ + go-redis:redis:v6.12.0:redis/vendor/github.com/go-redis/redis \ + go-sql-driver:mysql:v1.4.1:mysql/vendor/github.com/go-sql-driver/mysql \ + gobwas:glob:v0.2.3:glob/vendor/github.com/gobwas/glob \ + gogo:protobuf:v1.1.1:gogo_protobuf/vendor/github.com/gogo/protobuf \ + golang:protobuf:v1.1.0:protobuf/vendor/github.com/golang/protobuf \ + golang:snappy:2e65f85:snappy/vendor/github.com/golang/snappy \ + google:go-github:v24.0.1:go_github/vendor/github.com/google/go-github \ + google:go-cmp:v0.2.0:go_cmp/vendor/github.com/google/go-cmp \ + google:go-querystring:v1.0.0:go_querystring/vendor/github.com/google/go-querystring \ + google:uuid:0.2:uuid/vendor/github.com/google/uuid \ + googleapis:gax-go:v2.0.0:gax_go/vendor/github.com/googleapis/gax-go \ + gorilla:context:v1.1.1:context/vendor/github.com/gorilla/context \ + gorilla:mux:v1.6.2:mux/vendor/github.com/gorilla/mux \ + hailocab:go-hostpool:e80d13c:go_hostpool/vendor/github.com/hailocab/go-hostpool \ + harlow:kinesis-consumer:2f58b13:kinesis_consumer/vendor/github.com/harlow/kinesis-consumer \ + hashicorp:consul:v1.2.1:consul/vendor/github.com/hashicorp/consul \ + hashicorp:go-cleanhttp:d5fe4b5:go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \ + hashicorp:go-rootcerts:6bb64b3:go_rootcerts/vendor/github.com/hashicorp/go-rootcerts \ + hashicorp:go-uuid:v1.0.1:gouuid/vendor/github.com/hashicorp/go-uuid \ + hashicorp:serf:v0.8.1:serf/vendor/github.com/hashicorp/serf \ + influxdata:go-syslog:v2.0.0:go_syslog/vendor/github.com/influxdata/go-syslog \ + influxdata:tail:c434825:tail/vendor/github.com/influxdata/tail \ + influxdata:toml:270119a:toml/vendor/github.com/influxdata/toml \ + influxdata:wlog:7c63b0a:wlog/vendor/github.com/influxdata/wlog \ + jackc:pgx:v3.2.0:pgx/vendor/github.com/jackc/pgx \ + jcmturner:aescts:v1.0.1:aescts/vendor/gopkg.in/jcmturner/aescts.v1 \ + jcmturner:dnsutils:v1.0.1:dnsutils/vendor/gopkg.in/jcmturner/dnsutils.v1 \ + jcmturner:gofork:v1.0.0:gofork/vendor/github.com/jcmturner/gofork \ + jcmturner:gokrb5:v7.3.0:gokrb5/vendor/gopkg.in/jcmturner/gokrb5.v7 \ + jcmturner:rpc:v1.1.0:rpc/vendor/gopkg.in/jcmturner/rpc.v1 \ + jmespath:go-jmespath:c2b33e84:go_jmespath/vendor/github.com/jmespath/go-jmespath \ + kardianos:osext:ae77be6:osext/vendor/github.com/kardianos/osext \ + kardianos:service:615a14e:service/vendor/github.com/kardianos/service \ + karrick:godirwalk:v1.7.5:godirwalk/vendor/github.com/karrick/godirwalk \ + kballard:go-shellquote:95032a8:go_shellquote/vendor/github.com/kballard/go-shellquote \ + kr:logfmt:b84e30a:logfmt/vendor/github.com/kr/logfmt \ + kubernetes:apimachinery:d41becf:apimachinery/vendor/github.com/kubernetes/apimachinery \ + leodido:ragel-machinery:299bdde:ragel_machinery/vendor/github.com/leodido/ragel-machinery \ + mailru:easyjson:efc7eb8:easyjson/vendor/github.com/mailru/easyjson \ + matttproud:golang_protobuf_extensions:v1.0.1:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ + mdlayher:apcupsd:2fe55d9:apcupsd/vendor/github.com/mdlayher/apcupsd \ + miekg:dns:v1.0.8:dns/vendor/github.com/miekg/dns \ + mitchellh:go-homedir:3864e76:go_homedir/vendor/github.com/mitchellh/go-homedir \ + mitchellh:mapstructure:f15292f:mapstructure/vendor/github.com/mitchellh/mapstructure \ + multiplay:go-ts3:v1.0.0:go_ts3/vendor/github.com/multiplay/go-ts3 \ + naoina:go-stringutil:v0.1.0:go_stringutil/vendor/github.com/naoina/go-stringutil \ + nats-io:gnatsd:v1.2.0:gnatsd/vendor/github.com/nats-io/gnatsd \ + nats-io:go-nats:v1.5.0:nats/vendor/github.com/nats-io/go-nats \ + nats-io:nuid:v1.0.0:nuid/vendor/github.com/nats-io/nuid \ + nsqio:go-nsq:v1.0.7:go_nsq/vendor/github.com/nsqio/go-nsq \ + openconfig:gnmi:33a1865:gnmi/vendor/github.com/openconfig/gnmi \ + opencontainers:go-digest:v1.0.0-rc1:go_digest/vendor/github.com/opencontainers/go-digest \ + opencontainers:image-spec:v1.0.1:image_spec/vendor/github.com/opencontainers/image-spec \ + opentracing-contrib:go-observer:a52f234:go_observer/vendor/github.com/opentracing-contrib/go-observer \ + opentracing:opentracing-go:v1.0.2:opentracing_go/vendor/github.com/opentracing/opentracing-go \ + openzipkin:zipkin-go-opentracing:v0.3.4:zipkin_go_opentracing/vendor/github.com/openzipkin/zipkin-go-opentracing \ + glinton:ping:v0.1.1:ping/vendor/github.com/glinton/ping \ + pierrec:lz4:v2.0.3:lz4/vendor/github.com/pierrec/lz4 \ + pkg:errors:v0.8.0:errors/vendor/github.com/pkg/errors \ + pmezard:go-difflib:v1.0.0:go_difflib/vendor/github.com/pmezard/go-difflib \ + prometheus:client_golang:v0.9.2:client_golang/vendor/github.com/prometheus/client_golang \ + prometheus:client_model:5c3871d:client_model/vendor/github.com/prometheus/client_model \ + prometheus:common:7600349:common/vendor/github.com/prometheus/common \ + prometheus:procfs:ae68e2d:procfs/vendor/github.com/prometheus/procfs \ + rcrowley:go-metrics:e2704e1:go_metrics/vendor/github.com/rcrowley/go-metrics \ + samuel:go-zookeeper:c4fab1a:go_zookeeper/vendor/github.com/samuel/go-zookeeper \ + satori:go.uuid:v1.2.0:go_uuid/vendor/github.com/satori/go.uuid \ + shirou:gopsutil:v2.19.7:gopsutil/vendor/github.com/shirou/gopsutil \ + shirou:w32:bb4de01:w32/vendor/github.com/shirou/w32 \ + sirupsen:logrus:v1.0.5:logrus/vendor/github.com/sirupsen/logrus \ + soniah:gosnmp:96b8622:gosnmp/vendor/github.com/soniah/gosnmp \ + streadway:amqp:e5adc2a:amqp/vendor/github.com/streadway/amqp \ + stretchr:objx:v0.1.1:objx/vendor/github.com/stretchr/objx \ + stretchr:testify:v1.2.2:testify/vendor/github.com/stretchr/testify \ + tidwall:gjson:v1.3.0:gjson/vendor/github.com/tidwall/gjson \ + tidwall:match:1731857:match/vendor/github.com/tidwall/match \ + tidwall:pretty:v1.0.0:pretty/vendor/github.com/tidwall/pretty \ + vishvananda:netlink:b2de5d1:netlink/vendor/github.com/vishvananda/netlink \ + vishvananda:netns:13995c7:netns/vendor/github.com/vishvananda/netns \ + vjeantet:grok:v1.0.0:grok/vendor/github.com/vjeantet/grok \ + vmware:govmomi:v0.19.0:govmomi/vendor/github.com/vmware/govmomi \ + wavefronthq:wavefront-sdk-go:v0.9.2:wavefront_sdk_go/vendor/github.com/wavefronthq/wavefront-sdk-go \ + wvanbergen:kafka:e2edea9:kafka/vendor/github.com/wvanbergen/kafka \ + wvanbergen:kazoo-go:f72d861:kazoo_go/vendor/github.com/wvanbergen/kazoo-go \ + yuin:gopher-lua:46796da:gopher_lua/vendor/github.com/yuin/gopher-lua \ + census-instrumentation:opencensus-go:v0.17.0:opencensus_go/vendor/go.opencensus.io \ + golang:crypto:a214413:crypto/vendor/golang.org/x/crypto \ + golang:net:a680a1e:net/vendor/golang.org/x/net \ + golang:oauth2:d2e6202:oauth2/vendor/golang.org/x/oauth2 \ + golang:sync:42b3178:sync/vendor/golang.org/x/sync \ + golang:sys:51ab0e2:sys/vendor/golang.org/x/sys \ + golang:text:v0.3.0:text/vendor/golang.org/x/text \ + googleapis:google-api-go-client:19ff876:googleapis/vendor/google.golang.org/api \ + golang:appengine:v1.1.0:appengine/vendor/google.golang.org/appengine \ + google:go-genproto:fedd286:genproto/vendor/google.golang.org/genproto \ + grpc:grpc-go:v1.13.0:grpc/vendor/google.golang.org/grpc \ + go-asn1-ber:asn1-ber:v1.2:asn1_ber_v1/vendor/gopkg.in/asn1-ber.v1 \ + fatih:pool:v2.0.0:pool_v2/vendor/gopkg.in/fatih/pool.v2 \ + fsnotify:fsnotify:v1.4.7:fsnotify_v1/vendor/gopkg.in/fsnotify.v1 \ + rethinkdb:rethinkdb-go:v3.0.5:gorethink_v3/vendor/gopkg.in/gorethink/gorethink.v3 \ + go-inf:inf:v0.9.1:inf_v0/vendor/gopkg.in/inf.v0 \ + go-ldap:ldap:v2.5.1:ldap_v2/vendor/gopkg.in/ldap.v2 \ + go-mgo:mgo:9856a29:mgo_v2/vendor/gopkg.in/mgo.v2 \ + olivere:elastic:v5.0.70:elastic_v5/vendor/gopkg.in/olivere/elastic.v5 \ + go-tomb:tomb:dd63297:tomb_v1/vendor/gopkg.in/tomb.v1 \ + go-yaml:yaml:v2.2.1:yaml_v2/vendor/gopkg.in/yaml.v2 +GO_BUILDFLAGS= -ldflags "-X main.version=${DISTVERSION}" +GO_TARGET= ./cmd/telegraf + SUB_FILES= telegraf SUB_LIST= TELEGRAF_USER=${TELEGRAF_USER} \ TELEGRAF_GROUP=${TELEGRAF_GROUP} \ @@ -182,15 +185,12 @@ TELEGRAF_LOGDIR=/var/log/${PORTNAME} -do-build: - @cd ${WRKSRC}/${GH_SUBDIR} && \ - ${CP} src/github.com/shirou/gopsutil/disk/disk_freebsd_386.go src/github.com/shirou/gopsutil/disk/disk_freebsd_arm.go && \ - ${CP} src/github.com/shirou/gopsutil/cpu/cpu_freebsd_386.go src/github.com/shirou/gopsutil/cpu/cpu_freebsd_arm.go && \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/telegraf +post-patch: + ${CP} ${WRKSRC_gopsutil}/disk/disk_freebsd_386.go ${WRKSRC_gopsutil}/disk/disk_freebsd_arm.go + ${CP} ${WRKSRC_gopsutil}/cpu/cpu_freebsd_386.go ${WRKSRC_gopsutil}/cpu/cpu_freebsd_arm.go -do-install: +post-install: ${MKDIR} ${STAGEDIR}${TELEGRAF_LOGDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} \ ${WRKSRC}/${GH_SUBDIR}/etc/${PORTNAME}.conf \ ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample Index: head/net-mgmt/unbound_exporter/Makefile =================================================================== --- head/net-mgmt/unbound_exporter/Makefile +++ head/net-mgmt/unbound_exporter/Makefile @@ -18,16 +18,16 @@ GH_ACCOUNT= kumina GH_TAGNAME= b7e842d893d29200a5108eab717f5ab01d783c0c -GH_TUPLE= prometheus:client_golang:3fb53d:client_golang \ - prometheus:client_model:6f38060:client_model \ - prometheus:common:49fee29:common \ - prometheus:procfs:a1dba9c:procfs \ - beorn7:perks:4c0e845:perks \ - golang:protobuf:2bba060:protobuf \ - matttproud:golang_protobuf_extensions:c12348c:extensions \ - sirupsen:logrus:91da99d:logrus \ - golang:crypto:3d3f9f41:crypto \ - golang:sys:93218def:sys +GH_TUPLE= prometheus:client_golang:3fb53d:client_golang/vendor/github.com/prometheus/client_golang \ + prometheus:client_model:6f38060:client_model/vendor/github.com/prometheus/client_model \ + prometheus:common:49fee29:common/vendor/github.com/prometheus/common \ + prometheus:procfs:a1dba9c:procfs/vendor/github.com/prometheus/procfs \ + beorn7:perks:4c0e845:perks/vendor/github.com/beorn7/perks \ + golang:protobuf:2bba060:protobuf/vendor/github.com/golang/protobuf \ + matttproud:golang_protobuf_extensions:c12348c:extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ + sirupsen:logrus:91da99d:logrus/vendor/github.com/Sirupsen/logrus \ + golang:crypto:3d3f9f41:crypto/vendor/golang.org/x/crypto \ + golang:sys:93218def:sys/vendor/golang.org/x/sys GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} @@ -35,27 +35,5 @@ GROUPS= unbound PLIST_FILES= bin/unbound_exporter - -pre-build: - ${ECHO_CMD} ${WRKSRC_client_golang} - ${MKDIR} ${GO_WRKDIR_SRC}/github.com/prometheus - ${MKDIR} ${GO_WRKDIR_SRC}/github.com/beorn7 - ${MKDIR} ${GO_WRKDIR_SRC}/github.com/golang - ${MKDIR} ${GO_WRKDIR_SRC}/golang.org/x - ${MKDIR} ${GO_WRKDIR_SRC}/github.com/matttproud - ${MKDIR} ${GO_WRKDIR_SRC}/github.com/Sirupsen - ${MV} ${WRKSRC_client_golang} ${GO_WRKDIR_SRC}/github.com/prometheus/client_golang - ${MV} ${WRKSRC_client_model} ${GO_WRKDIR_SRC}/github.com/prometheus/client_model - ${MV} ${WRKSRC_common} ${GO_WRKDIR_SRC}/github.com/prometheus/common - ${MV} ${WRKSRC_procfs} ${GO_WRKDIR_SRC}/github.com/prometheus/procfs - ${MV} ${WRKSRC_perks} ${GO_WRKDIR_SRC}/github.com/beorn7/perks - ${MV} ${WRKSRC_protobuf} ${GO_WRKDIR_SRC}/github.com/golang/protobuf - ${MV} ${WRKSRC_extensions} ${GO_WRKDIR_SRC}/github.com/matttproud/golang_protobuf_extensions - ${MV} ${WRKSRC_logrus} ${GO_WRKDIR_SRC}/github.com/Sirupsen/logrus - ${MV} ${WRKSRC_crypto} ${GO_WRKDIR_SRC}/golang.org/x/crypto - ${MV} ${WRKSRC_sys} ${GO_WRKDIR_SRC}/golang.org/x/sys - -do-install: - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/unbound_exporter ${STAGEDIR}${PREFIX}/bin .include Index: head/net/cf/Makefile =================================================================== --- head/net/cf/Makefile +++ head/net/cf/Makefile @@ -18,7 +18,10 @@ GH_PROJECT= cli USES= go + +GO_BUILDFLAGS= -ldflags="-X code.cloudfoundry.org/cli/version.binaryVersion=${PORTVERSION}" GO_PKGNAME= code.cloudfoundry.org/cli +GO_TARGET= :cf PLIST_FILES= bin/cf @@ -26,18 +29,10 @@ OPTIONS_DEFINE= DOCS -do-build: - (cd ${WRKDIR}; \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} \ - install -v -ldflags="-X code.cloudfoundry.org/cli/version.binaryVersion=${PORTVERSION}" ${GO_TARGET}) - do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for x in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR} .endfor - -post-install: - ${MV} ${STAGEDIR}${PREFIX}/bin/cli ${STAGEDIR}${PREFIX}/bin/cf .include Index: head/net/drive/Makefile =================================================================== --- head/net/drive/Makefile +++ head/net/drive/Makefile @@ -22,57 +22,42 @@ GH_ACCOUNT= odeke-em GH_TAGNAME= b868c96 -GH_TUPLE= boltdb:bolt:v1.3.1:boltdb_bolt/../src/github.com/boltdb/bolt \ - census-instrumentation:opencensus-go:v0.22.1:census_instrumentation_opencensus/../src/go.opencensus.io \ - cheggaaa:pb:v1.0.28:cheggaaa_pb/../src/github.com/cheggaaa/pb \ - fatih:color:v1.7.0:fatih_color/../src/github.com/fatih/color \ - golang:crypto:71b5226:golang_crypto/../src/golang.org/x/crypto \ - golang:groupcache:869f871:golang_groupcache/../src/github.com/golang/groupcache \ - golang:net:ba9fcec:golang_net/../src/golang.org/x/net \ - golang:oauth2:0f29369:golang_oauth2/../src/golang.org/x/oauth2 \ - golang:protobuf:v1.3.2:golang_protobuf/../src/github.com/golang/protobuf \ - golang:sys:749cb33:golang_sys/../src/golang.org/x/sys \ - golang:text:3d0f797:golang_text/../src/golang.org/x/text \ - google:go-genproto:92dd089:google_go_genproto/../src/google.golang.org/genproto \ - google:google-api-go-client:v0.10.0:google_googleapigoclient/../src/google.golang.org/api \ - googleapis:google-cloud-go:v0.45.1:googleapis_googlecloudgo/../src/cloud.google.com/go \ - googleapis:gax-go:v2.0.5:googleapis_gaxgo/../src/github.com/googleapis/gax-go \ - grpc:grpc-go:v1.23.0:grpc_grpc_go/../src/google.golang.org/grpc \ - hashicorp:golang-lru:v0.5.3:hashicorp_golang_lru/../src/github.com/hashicorp/golang-lru \ - mattn:go-colorable:v0.1.2:mattn_gocolorable/../src/github.com/mattn/go-colorable \ - mattn:go-isatty:v0.0.9:mattn_goisatty/../src/github.com/mattn/go-isatty \ - mattn:go-runewidth:v0.0.4:mattn_gorunewidth/../src/github.com/mattn/go-runewidth \ - mxk:go-flowrate:cca7078:mxk_goflowrate/../src/github.com/mxk/go-flowrate \ - odeke-em:cache:baf8e43:odekeem_cache/../src/github.com/odeke-em/cache \ - odeke-em:cli-spinner:610063b:odekeem_clispinner/../src/github.com/odeke-em/cli-spinner \ - odeke-em:command:91ca5ec:odekeem_command/../src/github.com/odeke-em/command \ - odeke-em:exponential-backoff:96e25d3:odekeem_exponential_backoff/../src/github.com/odeke-em/exponential-backoff \ - odeke-em:extractor:801861a:odekeem_extractor/../src/github.com/odeke-em/extractor \ - odeke-em:go-utils:e8ebaed:odekeem_go_utils/../src/github.com/odeke-em/go-utils \ - odeke-em:go-uuid:b211d76:odekeem_gouuid/../src/github.com/odeke-em/go-uuid \ - odeke-em:log:8d60a69:odekeem_log/../src/github.com/odeke-em/log \ - odeke-em:meddler:d2b51d2:odekeem_meddler/../src/github.com/odeke-em/meddler \ - odeke-em:namespace:0ab79ba:odekeem_namespace/../src/github.com/odeke-em/namespace \ - odeke-em:pretty-words:9d37a7f:odekeem_prettywords/../src/github.com/odeke-em/pretty-words \ - odeke-em:semalim:9c88bf5:odekeem_semalim/../src/github.com/odeke-em/semalim \ - odeke-em:statos:292960a:odekeem_statos/../src/github.com/odeke-em/statos \ - skratchdot:open-golang:79abb63:skratchdot_opengolang/../src/github.com/skratchdot/open-golang \ - VividCortex:ewma:v1.1.1:VividCortex_ewma/../src/github.com/VividCortex/ewma +GH_TUPLE= boltdb:bolt:v1.3.1:boltdb_bolt/vendor/github.com/boltdb/bolt \ + census-instrumentation:opencensus-go:v0.22.1:census_instrumentation_opencensus/vendor/go.opencensus.io \ + cheggaaa:pb:v1.0.28:cheggaaa_pb/vendor/github.com/cheggaaa/pb \ + fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \ + golang:crypto:71b5226:golang_crypto/vendor/golang.org/x/crypto \ + golang:groupcache:869f871:golang_groupcache/vendor/github.com/golang/groupcache \ + golang:net:ba9fcec:golang_net/vendor/golang.org/x/net \ + golang:oauth2:0f29369:golang_oauth2/vendor/golang.org/x/oauth2 \ + golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \ + golang:sys:749cb33:golang_sys/vendor/golang.org/x/sys \ + golang:text:3d0f797:golang_text/vendor/golang.org/x/text \ + google:go-genproto:92dd089:google_go_genproto/vendor/google.golang.org/genproto \ + google:google-api-go-client:v0.10.0:google_googleapigoclient/vendor/google.golang.org/api \ + googleapis:google-cloud-go:v0.45.1:googleapis_googlecloudgo/vendor/cloud.google.com/go \ + googleapis:gax-go:v2.0.5:googleapis_gaxgo/vendor/github.com/googleapis/gax-go \ + grpc:grpc-go:v1.23.0:grpc_grpc_go/vendor/google.golang.org/grpc \ + hashicorp:golang-lru:v0.5.3:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \ + mattn:go-colorable:v0.1.2:mattn_gocolorable/vendor/github.com/mattn/go-colorable \ + mattn:go-isatty:v0.0.9:mattn_goisatty/vendor/github.com/mattn/go-isatty \ + mattn:go-runewidth:v0.0.4:mattn_gorunewidth/vendor/github.com/mattn/go-runewidth \ + mxk:go-flowrate:cca7078:mxk_goflowrate/vendor/github.com/mxk/go-flowrate \ + odeke-em:cache:baf8e43:odekeem_cache/vendor/github.com/odeke-em/cache \ + odeke-em:cli-spinner:610063b:odekeem_clispinner/vendor/github.com/odeke-em/cli-spinner \ + odeke-em:command:91ca5ec:odekeem_command/vendor/github.com/odeke-em/command \ + odeke-em:exponential-backoff:96e25d3:odekeem_exponential_backoff/vendor/github.com/odeke-em/exponential-backoff \ + odeke-em:extractor:801861a:odekeem_extractor/vendor/github.com/odeke-em/extractor \ + odeke-em:go-utils:e8ebaed:odekeem_go_utils/vendor/github.com/odeke-em/go-utils \ + odeke-em:go-uuid:b211d76:odekeem_gouuid/vendor/github.com/odeke-em/go-uuid \ + odeke-em:log:8d60a69:odekeem_log/vendor/github.com/odeke-em/log \ + odeke-em:meddler:d2b51d2:odekeem_meddler/vendor/github.com/odeke-em/meddler \ + odeke-em:namespace:0ab79ba:odekeem_namespace/vendor/github.com/odeke-em/namespace \ + odeke-em:pretty-words:9d37a7f:odekeem_prettywords/vendor/github.com/odeke-em/pretty-words \ + odeke-em:semalim:9c88bf5:odekeem_semalim/vendor/github.com/odeke-em/semalim \ + odeke-em:statos:292960a:odekeem_statos/vendor/github.com/odeke-em/statos \ + skratchdot:open-golang:79abb63:skratchdot_opengolang/vendor/github.com/skratchdot/open-golang \ + VividCortex:ewma:v1.1.1:VividCortex_ewma/vendor/github.com/VividCortex/ewma USE_GITHUB= yes - -post-patch: - @${MKDIR} ${GO_WRKDIR_SRC}/gopkg.in/cheggaaa/ - @${LN} -s ${GO_WRKDIR_SRC}/github.com/cheggaaa/pb ${GO_WRKDIR_SRC}/gopkg.in/cheggaaa/pb.v1 - @${MKDIR} ${GO_WRKDIR_SRC}/gopkg.in/fatih/ - @${LN} -s ${GO_WRKDIR_SRC}/github.com/fatih/color ${GO_WRKDIR_SRC}/gopkg.in/fatih/color.v1 - @${MKDIR} ${GO_WRKDIR_SRC}/gopkg.in/mattn/ - @${LN} -s ${GO_WRKDIR_SRC}/github.com/mattn/go-colorable ${GO_WRKDIR_SRC}/gopkg.in/mattn/go-colorable.v0 - @${LN} -s ${GO_WRKDIR_SRC}/github.com/mattn/go-isatty ${GO_WRKDIR_SRC}/gopkg.in/mattn/go-isatty.v0 - @${LN} -s ${GO_WRKDIR_SRC}/github.com/mattn/go-runewidth ${GO_WRKDIR_SRC}/gopkg.in/mattn/go-runewidth.v0 - @${MKDIR} ${GO_WRKDIR_SRC}/gopkg.in/VividCortex/ - @${LN} -s ${GO_WRKDIR_SRC}/github.com/VividCortex/ewma ${GO_WRKDIR_SRC}/gopkg.in/VividCortex/ewma.v1 - -do-install: - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/drive ${STAGEDIR}${PREFIX}/bin/drive .include Index: head/net/go-cs/Makefile =================================================================== --- head/net/go-cs/Makefile +++ head/net/go-cs/Makefile @@ -18,7 +18,7 @@ PLIST_FILES= bin/cs man/man1/cs.1.gz -GO_TARGET= ${GO_PKGNAME}/cs +GO_TARGET= ./cs post-install: ${INSTALL_MAN} ${WRKSRC}/cs.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 Index: head/net/gobgp/Makefile =================================================================== --- head/net/gobgp/Makefile +++ head/net/gobgp/Makefile @@ -17,7 +17,7 @@ GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} GO_TARGET= ./cmd/gobgp \ - ./cmd/gobgpd + ./cmd/gobgpd:${PREFIX}/libexec/gobgpd GH_ACCOUNT= osrg PLIST_FILES= bin/gobgp libexec/gobgpd GH_TUPLE= \ @@ -68,10 +68,6 @@ USE_RC_SUBR= gobgpd SUB_FILES= gobgpd - -do-install: - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/gobgp ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/gobgpd ${STAGEDIR}${PREFIX}/libexec post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d Index: head/net/goreplay/Makefile =================================================================== --- head/net/goreplay/Makefile +++ head/net/goreplay/Makefile @@ -23,11 +23,4 @@ PLIST_FILES= bin/${PORTNAME} -do-build: - @cd ${WRKSRC}/${GH_SUBDIR} ; ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/goreplay \ - ${STAGEDIR}${PREFIX}/bin/ - .include Index: head/net/grpcurl/Makefile =================================================================== --- head/net/grpcurl/Makefile +++ head/net/grpcurl/Makefile @@ -17,22 +17,16 @@ GH_ACCOUNT= fullstorydev GH_SUBDIR= src/github.com/fullstorydev/grpcurl GH_TAGNAME= ca5693f -GH_TUPLE= golang:protobuf:c65a041:jsonpb/src/github.com/golang/protobuf \ - jhump:protoreflect:5cc2142:protoreflect/src/github.com/jhump/protoreflect \ - golang:net:5f9ae10:net/src/golang.org/x/net \ - grpc:grpc-go:4172bfc:grpcgo/src/google.golang.org/grpc \ - golang:text:7922cc4:text/src/golang.org/x/text \ - google:go-genproto:7fd901a:gogenproto/src/google.golang.org/genproto +GH_TUPLE= golang:protobuf:c65a041:jsonpb/vendor/github.com/golang/protobuf \ + jhump:protoreflect:5cc2142:protoreflect/vendor/github.com/jhump/protoreflect \ + golang:net:5f9ae10:net/vendor/golang.org/x/net \ + grpc:grpc-go:4172bfc:grpcgo/vendor/google.golang.org/grpc \ + golang:text:7922cc4:text/vendor/golang.org/x/text \ + google:go-genproto:7fd901a:gogenproto/vendor/google.golang.org/genproto -PLIST_FILES= bin/grpcurl +GO_BUILDFLAGS= -ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -s -w" +GO_TARGET= ./cmd/${PORTNAME} -do-build: - cd ${WRKSRC}/cmd/${PORTNAME} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ - ${LOCALBASE}/bin/go build -ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -s -w" \ - -o ${PORTNAME} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/fullstorydev/grpcurl/cmd/${PORTNAME}/${PORTNAME} \ - ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +PLIST_FILES= bin/grpcurl .include Index: head/net/madonctl/Makefile =================================================================== --- head/net/madonctl/Makefile +++ head/net/madonctl/Makefile @@ -15,8 +15,6 @@ USES= go:modules -#GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} - PLIST_FILES= bin/madonctl GH_ACCOUNT= McKael @@ -48,8 +46,5 @@ spf13:viper:v1.4.0:spf13_viper/vendor/github.com/spf13/viper \ stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify USE_GITHUB= yes - -do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/bin/madonctl ${STAGEDIR}${PREFIX}/bin/madonctl .include Index: head/net/nsq/Makefile =================================================================== --- head/net/nsq/Makefile +++ head/net/nsq/Makefile @@ -12,7 +12,7 @@ ONLY_FOR_ARCHS= amd64 -USES= compiler go +USES= go USE_RC_SUBR= nsqd nsqlookupd nsqadmin @@ -20,41 +20,21 @@ GH_ACCOUNT= nsqio GH_SUBDIR= src/github.com/nsqio/nsq -GH_TUPLE= BurntSushi:toml:2dff111:toml/src/github.com/BurntSushi/toml \ - bitly:go-hostpool:a3a6125:go_hostpool/src/github.com/bitly/go-hostpool \ - bitly:timer_metrics:afad179:timer_metrics/src/github.com/bitly/timer_metrics \ - blang:semver:9bf7bff:semver/src/github.com/blang/semver \ - bmizerany:perks:6cb9d9d:perks/src/github.com/bmizerany/perks \ - golang:snappy:d9eb7a3:snappy/src/github.com/golang/snappy \ - judwhite:go-svc:63c1240:go_svc/src/github.com/judwhite/go-svc \ - julienschmidt:httprouter:6aacfd5:httprouter/src/github.com/julienschmidt/httprouter \ - mreiferson:go-options:77551d2:go_options/src/github.com/mreiferson/go-options \ - nsqio:go-diskqueue:0681a1a:go_diskqueue/src/github.com/nsqio/go-diskqueue \ - nsqio:go-nsq:a53d495:go_nsq/src/github.com/nsqio/go-nsq +GH_TUPLE= BurntSushi:toml:2dff111:toml/vendor/github.com/BurntSushi/toml \ + bitly:go-hostpool:a3a6125:go_hostpool/vendor/github.com/bitly/go-hostpool \ + bitly:timer_metrics:afad179:timer_metrics/vendor/github.com/bitly/timer_metrics \ + blang:semver:9bf7bff:semver/vendor/github.com/blang/semver \ + bmizerany:perks:6cb9d9d:perks/vendor/github.com/bmizerany/perks \ + golang:snappy:d9eb7a3:snappy/vendor/github.com/golang/snappy \ + judwhite:go-svc:63c1240:go_svc/vendor/github.com/judwhite/go-svc \ + julienschmidt:httprouter:6aacfd5:httprouter/vendor/github.com/julienschmidt/httprouter \ + mreiferson:go-options:77551d2:go_options/vendor/github.com/mreiferson/go-options \ + nsqio:go-diskqueue:0681a1a:go_diskqueue/vendor/github.com/nsqio/go-diskqueue \ + nsqio:go-nsq:a53d495:go_nsq/vendor/github.com/nsqio/go-nsq -TARGETS= nsqd nsqlookupd nsqadmin nsq_to_nsq nsq_to_file \ - nsq_to_http nsq_tail nsq_stat to_nsq +GO_BUILDFLAGS= -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" +GO_TARGET= ./apps/nsqd ./apps/nsqlookupd ./apps/nsqadmin \ + ./apps/nsq_to_nsq ./apps/nsq_to_file ./apps/nsq_to_http \ + ./apps/nsq_tail ./apps/nsq_stat ./apps/to_nsq -.for _t in ${TARGETS} -build-${_t}: - cd ${GO_WRKSRC}/apps/${_t}; \ - ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build \ - -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/${_t} -install-${_t}: - ${INSTALL_PROGRAM} ${GO_WRKSRC}/apps/${_t}/bin/${_t} \ - ${STAGEDIR}${PREFIX}/bin/${_t} - -build_targets+= build-${_t} -install_targets+= install-${_t} -.endfor - -do-build: ${build_targets} -do-install: ${install_targets} - -.include - -.if ${COMPILER_TYPE} == clang -BUILD_ENV= CC=clang -.endif - -.include +.include Index: head/net/traefik/Makefile =================================================================== --- head/net/traefik/Makefile +++ head/net/traefik/Makefile @@ -23,19 +23,18 @@ USE_RC_SUBR= traefik +GO_BUILDFLAGS= -ldflags "-s -w \ + -X github.com/containous/traefik/version.Version=${DISTVERSION} \ + -X github.com/containous/traefik/version.BuildDate=`date -u '+%Y-%m-%d_%I:%M:%S%p'`" +GO_TARGET= ./cmd/traefik +CGO_ENABLED= 0 + USERS= traefik GROUPS= traefik PLIST_FILES= bin/traefik \ "@sample etc/traefik.toml.sample" -TRAEFIK_BUILD_ENV= ${MAKE_ENV} \ - CGO_ENABLED=0 - -TRAEFIK_LDARGS= -ldflags "-s -w \ - -X github.com/containous/traefik/version.Version=${DISTVERSION} \ - -X github.com/containous/traefik/version.BuildDate=`date -u '+%Y-%m-%d_%I:%M:%S%p'`" - # Recipe for building the web UI # Note this is not done during a standard port build as # it downloads node modules from the internet during build. @@ -49,20 +48,17 @@ # yarn install && \ # yarn run build -post-extract: +post-patch: @${MV} ${WRKDIR}/static ${WRKSRC} # Install a sample configuration file which works by default # without manual tweaking ${REINPLACE_CMD} -e 's|:80|:8088|' \ -e 's|\[docker|# \[docker|' ${WRKSRC}/traefik.sample.toml -do-build: - @cd ${WRKSRC}/src/github.com/containous/traefik; \ - ${SETENV} ${BUILD_ENV} ${TRAEFIK_BUILD_ENV} GOPATH=${WRKSRC} go generate && \ - ${SETENV} ${BUILD_ENV} ${TRAEFIK_BUILD_ENV} GOPATH=${WRKSRC} go build ${TRAEFIK_LDARGS} -v -x ./cmd/traefik +pre-build: + cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} generate -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/containous/traefik/traefik ${STAGEDIR}${PREFIX}/bin/traefik - ${INSTALL_DATA} ${WRKSRC}/src/github.com/containous/traefik/traefik.sample.toml ${STAGEDIR}${PREFIX}/etc/traefik.toml.sample +post-install: + ${INSTALL_DATA} ${WRKSRC}/traefik.sample.toml ${STAGEDIR}${PREFIX}/etc/traefik.toml.sample .include Index: head/net/v2ray/Makefile =================================================================== --- head/net/v2ray/Makefile +++ head/net/v2ray/Makefile @@ -32,6 +32,8 @@ miekg:dns:v1.1.4:miekg_dns/vendor/github.com/miekg/dns GO_BUILDFLAGS= -ldflags='-s -w' +GO_TARGET= ./main:v2ray \ + ./infra/control/main:v2ctl USERS= v2ray GROUPS= v2ray @@ -39,16 +41,9 @@ SUB_LIST= USER="${USERS}" \ GROUP="${GROUPS}" -do-build: - cd ${GO_WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} -o ${GO_WRKDIR_BIN}/v2ray v2ray.com/core/main && \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} -o ${GO_WRKDIR_BIN}/v2ctl v2ray.com/core/infra/control/main - -do-install: +post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_PROGRAM} ${WRKDIR}/bin/v2ray ${STAGEDIR}${PREFIX}/bin/v2ray - ${INSTALL_PROGRAM} ${WRKDIR}/bin/v2ctl ${STAGEDIR}${PREFIX}/bin/v2ctl ${INSTALL_DATA} ${WRKSRC}/release/config/config.json ${STAGEDIR}${ETCDIR}/config.json.sample ${INSTALL_DATA} ${WRKSRC}/release/config/vpoint_socks_vmess.json ${STAGEDIR}${ETCDIR}/vpoint_socks_vmess.json ${INSTALL_DATA} ${WRKSRC}/release/config/vpoint_vmess_freedom.json ${STAGEDIR}${ETCDIR}/vpoint_vmess_freedom.json Index: head/science/molgif/Makefile =================================================================== --- head/science/molgif/Makefile +++ head/science/molgif/Makefile @@ -19,11 +19,4 @@ PLIST_FILES= bin/${PORTNAME} -do-build: - @cd ${WRKSRC}/${GH_SUBDIR} && \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - .include Index: head/security/acmetool/Makefile =================================================================== --- head/security/acmetool/Makefile +++ head/security/acmetool/Makefile @@ -16,49 +16,46 @@ GH_ACCOUNT= hlandau GH_PROJECT= acme GH_SUBDIR= src/github.com/hlandau/acme -GH_TUPLE= alecthomas:template:a0175ee:template/src/github.com/alecthomas/template \ - alecthomas:units:2efee85:units/src/github.com/alecthomas/units \ - coreos:go-systemd:749ef98:go_systemd/src/github.com/coreos/go-systemd \ - hlandau:acme:221ea15:acme/src/github.com/hlandau/acme \ - hlandau:buildinfo:337a29b:buildinfo/src/github.com/hlandau/buildinfo \ - hlandau:dexlogconfig:244f29b:dexlogconfig/src/github.com/hlandau/dexlogconfig \ - hlandau:goutils:0cdb66a:goutils/src/github.com/hlandau/goutils \ - hlandau:xlog:197ef79:xlog/src/github.com/hlandau/xlog \ - jmhodges:clock:880ee4c:clock/src/github.com/jmhodges/clock \ - mattn:go-isatty:6ca4dbf:go_isatty/src/github.com/mattn/go-isatty \ - mattn:go-runewidth:a9d6d1e:go_runewidth/src/github.com/mattn/go-runewidth \ - mitchellh:go-wordwrap:ad45545:go_wordwrap/src/github.com/mitchellh/go-wordwrap \ - ogier:pflag:45c278a:pflag/src/github.com/ogier/pflag \ - peterhellberg:link:6d32b8d:link/src/github.com/peterhellberg/link \ - satori:go.uuid:36e9d2e:go_uuid/src/github.com/satori/go.uuid \ - shiena:ansicolor:a422bbe:ansicolor/src/github.com/shiena/ansicolor \ - golang:crypto:91a49db:crypto/src/golang.org/x/crypto \ - golang:net:22ae77b:net/src/golang.org/x/net \ - golang:sys:dd2ff4a:sys/src/golang.org/x/sys \ - golang:text:b7ef84a:text/src/golang.org/x/text \ - alecthomas:kingpin:947dcec:kingpin/src/gopkg.in/alecthomas/kingpin.v2 \ - cheggaaa:pb:72b9643:pb/src/gopkg.in/cheggaaa/pb.v1 \ - hlandau:configurable:4149686:configurable/src/gopkg.in/hlandau/configurable.v1 \ - hlandau:easyconfig:7589cb9:easyconfig/src/gopkg.in/hlandau/easyconfig.v1 \ - hlandau:service:b64b346:service/src/gopkg.in/hlandau/service.v2 \ - hlandau:svcutils:c25dac4:svcutils/src/gopkg.in/hlandau/svcutils.v1 \ - square:go-jose:aa2e30f:go_jose/src/gopkg.in/square/go-jose.v1 \ - tylerb:graceful:4654dfb:graceful/src/gopkg.in/tylerb/graceful.v1 \ - go-yaml:yaml:7f97868:go_yaml/src/gopkg.in/yaml.v2 +GH_TUPLE= alecthomas:template:a0175ee:template/vendor/github.com/alecthomas/template \ + alecthomas:units:2efee85:units/vendor/github.com/alecthomas/units \ + coreos:go-systemd:749ef98:go_systemd/vendor/github.com/coreos/go-systemd \ + hlandau:acme:221ea15:acme/vendor/github.com/hlandau/acme \ + hlandau:buildinfo:337a29b:buildinfo/vendor/github.com/hlandau/buildinfo \ + hlandau:dexlogconfig:244f29b:dexlogconfig/vendor/github.com/hlandau/dexlogconfig \ + hlandau:goutils:0cdb66a:goutils/vendor/github.com/hlandau/goutils \ + hlandau:xlog:197ef79:xlog/vendor/github.com/hlandau/xlog \ + jmhodges:clock:880ee4c:clock/vendor/github.com/jmhodges/clock \ + mattn:go-isatty:6ca4dbf:go_isatty/vendor/github.com/mattn/go-isatty \ + mattn:go-runewidth:a9d6d1e:go_runewidth/vendor/github.com/mattn/go-runewidth \ + mitchellh:go-wordwrap:ad45545:go_wordwrap/vendor/github.com/mitchellh/go-wordwrap \ + ogier:pflag:45c278a:pflag/vendor/github.com/ogier/pflag \ + peterhellberg:link:6d32b8d:link/vendor/github.com/peterhellberg/link \ + satori:go.uuid:36e9d2e:go_uuid/vendor/github.com/satori/go.uuid \ + shiena:ansicolor:a422bbe:ansicolor/vendor/github.com/shiena/ansicolor \ + golang:crypto:91a49db:crypto/vendor/golang.org/x/crypto \ + golang:net:22ae77b:net/vendor/golang.org/x/net \ + golang:sys:dd2ff4a:sys/vendor/golang.org/x/sys \ + golang:text:b7ef84a:text/vendor/golang.org/x/text \ + alecthomas:kingpin:947dcec:kingpin/vendor/gopkg.in/alecthomas/kingpin.v2 \ + cheggaaa:pb:72b9643:pb/vendor/gopkg.in/cheggaaa/pb.v1 \ + hlandau:configurable:4149686:configurable/vendor/gopkg.in/hlandau/configurable.v1 \ + hlandau:easyconfig:7589cb9:easyconfig/vendor/gopkg.in/hlandau/easyconfig.v1 \ + hlandau:service:b64b346:service/vendor/gopkg.in/hlandau/service.v2 \ + hlandau:svcutils:c25dac4:svcutils/vendor/gopkg.in/hlandau/svcutils.v1 \ + square:go-jose:aa2e30f:go_jose/vendor/gopkg.in/square/go-jose.v1 \ + tylerb:graceful:4654dfb:graceful/vendor/gopkg.in/tylerb/graceful.v1 \ + go-yaml:yaml:7f97868:go_yaml/vendor/gopkg.in/yaml.v2 -do-build: - @cd ${WRKSRC}/src/github.com/hlandau/acme && \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} \ - go build -o ${WRKSRC}/bin/${PORTNAME} -ldflags "\ +GO_BUILDFLAGS= -ldflags "\ -X github.com/hlandau/acme/hooks.DefaultPath=${PREFIX}/libexec/acme/hooks \ -X github.com/hlandau/acme/storage.RecommendedPath=/var/db/acme \ - -X github.com/hlandau/buildinfo.BuildInfo=${PORTNAME}-v${PORTVERSION}-freebsd-ports \ - "\ - github.com/hlandau/acme/cmd/acmetool - @${WRKSRC}/bin/${PORTNAME} --help-man > ${WRKSRC}/${PORTNAME}.8 + -X github.com/hlandau/buildinfo.BuildInfo=${PORTNAME}-v${PORTVERSION}-freebsd-ports" +GO_TARGET= ./cmd/acmetool -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +post-build: + ${GO_WRKDIR_BIN}/${PORTNAME} --help-man > ${WRKSRC}/${PORTNAME}.8 + +post-install: ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8 ${MKDIR} ${STAGEDIR}/var/db/acme ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/acme/hooks Index: head/security/go-cve-dictionary/Makefile =================================================================== --- head/security/go-cve-dictionary/Makefile +++ head/security/go-cve-dictionary/Makefile @@ -20,35 +20,37 @@ GH_ACCOUNT= kotakanbe GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} -GH_TUPLE+= VividCortex:ewma:v1.1.1:ewma/src/gopkg.in/VividCortex/ewma.v1 -GH_TUPLE+= asaskevich:govalidator:v9:govalidator/src/github.com/asaskevich/govalidator -GH_TUPLE+= cheggaaa:pb:v2.0.6:pb/src/gopkg.in/cheggaaa/pb.v2 -GH_TUPLE+= dgrijalva:jwt-go:v3.2.0:jwtgo/src/github.com/dgrijalva/jwt-go -GH_TUPLE+= fatih:color:v1.7.0:colorv1/src/github.com/fatih/color -GH_TUPLE+= go-redis:redis:v6.13.2:redis/src/github.com/go-redis/redis -GH_TUPLE+= go-sql-driver:mysql:v1.4.0:mysql/src/github.com/go-sql-driver/mysql -GH_TUPLE+= go-stack:stack:v1.7.0:gostack/src/github.com/go-stack/stack -GH_TUPLE+= golang:crypto:f027049:golangcrypto/src/golang.org/x/crypto -GH_TUPLE+= golang:sys:acbc56f:golangsys/src/golang.org/x/sys -GH_TUPLE+= google:subcommands:5bae204:subcommands/src/github.com/google/subcommands -GH_TUPLE+= hashicorp:go-version:270f2f7:goversion/src/github.com/hashicorp/go-version -GH_TUPLE+= inconshreveable:log15:v2.13:log15/src/github.com/inconshreveable/log15 -GH_TUPLE+= jinzhu:gorm:v1.9.1:gorm/src/github.com/jinzhu/gorm -GH_TUPLE+= jinzhu:inflection:0414036:inflection/src/github.com/jinzhu/inflection -GH_TUPLE+= k0kubun:pp:v2.3.0:pp/src/github.com/k0kubun/pp -GH_TUPLE+= knqyf263:go-cpe:659663f:gocpe/src/github.com/knqyf263/go-cpe -GH_TUPLE+= htcat:htcat:v1.0.2:htcat/src/github.com/htcat/htcat -GH_TUPLE+= labstack:echo:6d227df:echo/src/github.com/labstack/echo -GH_TUPLE+= labstack:gommon:0.2.6:gommon/src/github.com/labstack/gommon -GH_TUPLE+= lib:pq:90697d6:pq/src/github.com/lib/pq -GH_TUPLE+= mattn:go-colorable:v0.0.9:gocolorable/src/github.com/mattn/go-colorable -GH_TUPLE+= mattn:go-isatty:v0.0.3:goisatty/src/github.com/mattn/go-isatty -GH_TUPLE+= mattn:go-runewidth:v0.0.2:gorunewidth/src/github.com/mattn/go-runewidth -GH_TUPLE+= mattn:go-sqlite3:v1.9.0:gosqlite3/src/github.com/mattn/go-sqlite3 -GH_TUPLE+= olekukonko:tablewriter:d4647c9:tablewriter/src/github.com/olekukonko/tablewriter -GH_TUPLE+= pkg:errors:v0.8.0:pkgerrors/src/github.com/pkg/errors -GH_TUPLE+= valyala:fasttemplate:dcecefd:fasttemplate/src/github.com/valyala/fasttemplate +GH_TUPLE+= VividCortex:ewma:v1.1.1:ewma/vendor/gopkg.in/VividCortex/ewma.v1 +GH_TUPLE+= asaskevich:govalidator:v9:govalidator/vendor/github.com/asaskevich/govalidator +GH_TUPLE+= cheggaaa:pb:v2.0.6:pb/vendor/gopkg.in/cheggaaa/pb.v2 +GH_TUPLE+= dgrijalva:jwt-go:v3.2.0:jwtgo/vendor/github.com/dgrijalva/jwt-go +GH_TUPLE+= fatih:color:v1.7.0:colorv1/vendor/github.com/fatih/color +GH_TUPLE+= go-redis:redis:v6.13.2:redis/vendor/github.com/go-redis/redis +GH_TUPLE+= go-sql-driver:mysql:v1.4.0:mysql/vendor/github.com/go-sql-driver/mysql +GH_TUPLE+= go-stack:stack:v1.7.0:gostack/vendor/github.com/go-stack/stack +GH_TUPLE+= golang:crypto:f027049:golangcrypto/vendor/golang.org/x/crypto +GH_TUPLE+= golang:sys:acbc56f:golangsys/vendor/golang.org/x/sys +GH_TUPLE+= google:subcommands:5bae204:subcommands/vendor/github.com/google/subcommands +GH_TUPLE+= hashicorp:go-version:270f2f7:goversion/vendor/github.com/hashicorp/go-version +GH_TUPLE+= inconshreveable:log15:v2.13:log15/vendor/github.com/inconshreveable/log15 +GH_TUPLE+= jinzhu:gorm:v1.9.1:gorm/vendor/github.com/jinzhu/gorm +GH_TUPLE+= jinzhu:inflection:0414036:inflection/vendor/github.com/jinzhu/inflection +GH_TUPLE+= k0kubun:pp:v2.3.0:pp/vendor/github.com/k0kubun/pp +GH_TUPLE+= knqyf263:go-cpe:659663f:gocpe/vendor/github.com/knqyf263/go-cpe +GH_TUPLE+= htcat:htcat:v1.0.2:htcat/vendor/github.com/htcat/htcat +GH_TUPLE+= labstack:echo:6d227df:echo/vendor/github.com/labstack/echo +GH_TUPLE+= labstack:gommon:0.2.6:gommon/vendor/github.com/labstack/gommon +GH_TUPLE+= lib:pq:90697d6:pq/vendor/github.com/lib/pq +GH_TUPLE+= mattn:go-colorable:v0.0.9:gocolorable/vendor/github.com/mattn/go-colorable +GH_TUPLE+= mattn:go-isatty:v0.0.3:goisatty/vendor/github.com/mattn/go-isatty +GH_TUPLE+= mattn:go-runewidth:v0.0.2:gorunewidth/vendor/github.com/mattn/go-runewidth +GH_TUPLE+= mattn:go-sqlite3:v1.9.0:gosqlite3/vendor/github.com/mattn/go-sqlite3 +GH_TUPLE+= olekukonko:tablewriter:d4647c9:tablewriter/vendor/github.com/olekukonko/tablewriter +GH_TUPLE+= pkg:errors:v0.8.0:pkgerrors/vendor/github.com/pkg/errors +GH_TUPLE+= valyala:fasttemplate:dcecefd:fasttemplate/vendor/github.com/valyala/fasttemplate +GO_BUILDFLAGS= -ldflags "-X main.version=${PORTVERSION}" + USERS= vuls GROUPS= vuls @@ -60,22 +62,15 @@ ${WRKSRC}/db/rdb.go \ ${WRKSRC}/db/redis.go @${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-runewidth.v0|github.com/mattn/go-runewidth|' \ - ${WRKSRC}/src/gopkg.in/cheggaaa/pb.v2/util.go + ${WRKSRC}/vendor/gopkg.in/cheggaaa/pb.v2/util.go @${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-colorable.v0|github.com/mattn/go-colorable|' \ - ${WRKSRC}/src/gopkg.in/cheggaaa/pb.v2/pb.go + ${WRKSRC}/vendor/gopkg.in/cheggaaa/pb.v2/pb.go @${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-isatty.v0|github.com/mattn/go-isatty|' \ - ${WRKSRC}/src/gopkg.in/cheggaaa/pb.v2/pb.go + ${WRKSRC}/vendor/gopkg.in/cheggaaa/pb.v2/pb.go @${REINPLACE_CMD} -e 's|gopkg.in/fatih/color.v1|github.com/fatih/color|' \ - ${WRKSRC}/src/gopkg.in/cheggaaa/pb.v2/template.go + ${WRKSRC}/vendor/gopkg.in/cheggaaa/pb.v2/template.go -do-build: - @cd ${GO_WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} \ - ${GO_CMD} build -v -x -ldflags "-X main.version=${PORTVERSION}" \ - -o ${WRKSRC}/${PORTNAME} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +post-install: ${MKDIR} ${STAGEDIR}/var/db/vuls ${MKDIR} ${STAGEDIR}/var/log/vuls Index: head/security/meek/Makefile =================================================================== --- head/security/meek/Makefile +++ head/security/meek/Makefile @@ -17,10 +17,13 @@ USES= go USE_GITHUB= nodefault -GH_TUPLE= golang:crypto:c126467:crypto/src/golang.org/x/crypto \ - golang:net:a680a1e:net/src/golang.org/x/net \ - golang:text:0605a83:text/src/golang.org/x/text +GH_TUPLE= golang:crypto:c126467:crypto/vendor/golang.org/x/crypto \ + golang:net:a680a1e:net/vendor/golang.org/x/net \ + golang:text:0605a83:text/vendor/golang.org/x/text +GO_TARGET= ./meek-client \ + ./meek-server + GOPTLIBVERSION= 0.7 PLIST_FILES= bin/meek-client \ @@ -30,22 +33,18 @@ SUB_FILES= pkg-message -post-extract: - @${MKDIR} ${WRKSRC}/src/git.torproject.org/pluggable-transports - @${LN} -s ${WRKDIR}/${PORTNAME}-${PORTVERSION} ${WRKSRC}/src/git.torproject.org/pluggable-transports/${PORTNAME} - @${LN} -s ${WRKDIR}/goptlib-${GOPTLIBVERSION} ${WRKSRC}/src/git.torproject.org/pluggable-transports/goptlib.git +post-patch: + @${MKDIR} ${WRKDIR}/src/git.torproject.org/pluggable-transports + @${LN} -s ${WRKSRC} ${WRKDIR}/src/git.torproject.org/pluggable-transports/${PORTNAME} + @${LN} -s ${WRKDIR}/goptlib-${GOPTLIBVERSION} ${WRKDIR}/src/git.torproject.org/pluggable-transports/goptlib.git -do-build: - @cd ${WRKSRC}/meek-client && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build - @cd ${WRKSRC}/meek-server && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build - do-test: - @cd ${WRKSRC}/meek-client && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go test - @cd ${WRKSRC}/meek-server && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go test +.for t in ${GO_TARGET} + cd ${GO_WRKSRC}; \ + ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_BUILDFLAGS} ${t} +.endfor -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/meek-client/meek-client ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/meek-server/meek-server ${STAGEDIR}${PREFIX}/bin +post-install: ${INSTALL_MAN} ${WRKSRC}/doc/meek-server.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/meek-client.1 ${STAGEDIR}${PREFIX}/man/man1 Index: head/security/obfs4proxy-tor/Makefile =================================================================== --- head/security/obfs4proxy-tor/Makefile +++ head/security/obfs4proxy-tor/Makefile @@ -13,42 +13,35 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKDIR}/LICENSE -USES= cpe go tar:xz +USES= cpe go:modules tar:xz CPE_VENDOR= torproject -GO_TARGET= gitlab.com/yawning/obfs4.git - USE_GITHUB= nodefault -GH_TUPLE= ahf:goptlib:7d56ec4:goptlib/src/git.torproject.org/pluggable-transports/goptlib.git \ - agl:ed25519:5312a61:ed25519/src/github.com/agl/ed25519 \ - dchest:siphash:v1.2.1:siphash/src/github.com/dchest/siphash \ - dsnet:compress:v0.0.1:dsnet_compress/src/github.com/dsnet/compress \ - golang:crypto:cc06ce4:golang_crypto/src/golang.org/x/crypto \ - golang:net:3b0461e:golang_net/src/golang.org/x/net \ - golang:text:v0.3.0:golang_text/src/golang.org/x/text \ - golang:sys:d432491:golang_sys/src/golang.org/x/sys \ - Yawning:bsaes:26d1add:Yawning_bsaes/src/git.schwanenlied.me/yawning/bsaes.git +GH_TUPLE= ahf:goptlib:7d56ec4:goptlib/vendor/git.torproject.org/pluggable-transports/goptlib.git \ + agl:ed25519:5312a61:ed25519/vendor/github.com/agl/ed25519 \ + dchest:siphash:v1.2.1:siphash/vendor/github.com/dchest/siphash \ + dsnet:compress:v0.0.1:dsnet_compress/vendor/github.com/dsnet/compress \ + golang:crypto:cc06ce4:golang_crypto/vendor/golang.org/x/crypto \ + golang:net:3b0461e:golang_net/vendor/golang.org/x/net \ + golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \ + golang:sys:d432491:golang_sys/vendor/golang.org/x/sys \ + Yawning:bsaes:26d1add:Yawning_bsaes/vendor/git.schwanenlied.me/yawning/bsaes.git USE_GITLAB= nodefault -GL_TUPLE= yawning:utls:dd99191913e03b2cd62655cd260d79187fbf8a9f:yawning_utls/src/gitlab.com/yawning/utls.git +GL_TUPLE= yawning:utls:dd99191913e03b2cd62655cd260d79187fbf8a9f:yawning_utls/vendor/gitlab.com/yawning/utls.git +GO_TARGET= ../obfs4proxy + SUB_FILES= pkg-message PLIST_FILES= bin/obfs4proxy \ man/man1/obfs4proxy.1.gz -do-build: - @${RM} ${WRKDIR}/go.mod - @${MKDIR} ${GO_WRKSRC}/src/${GO_TARGET:H} - @${RLN} ${WRKDIR} ${GO_WRKSRC}/src/${GO_TARGET} - @${RLN} ${WRKDIR}/src ${GO_WRKSRC}/src/${GO_TARGET}/src - @(cd ${WRKDIR}/${PORTNAME} && \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKDIR}/src/${PORTNAME} ${GO_CMD} \ - build ${GO_BUILDFLAGS} -o ${WRKDIR}/bin/${PORTNAME}) +post-patch: + ${LN} -s ${WRKSRC}/vendor ${WRKDIR} -do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin +post-install: ${INSTALL_MAN} ${WRKDIR}/doc/obfs4proxy.1 ${STAGEDIR}${PREFIX}/man/man1 .include Index: head/security/onionscan/Makefile =================================================================== --- head/security/onionscan/Makefile +++ head/security/onionscan/Makefile @@ -15,24 +15,14 @@ USE_GITHUB= yes GH_ACCOUNT= s-rah -GH_TUPLE= HouzuoGuo:tiedot:3.4:tiedot/github.com/HouzuoGuo/tiedot \ - rwcarlsen:goexif:8d986c0:goexif/github.com/rwcarlsen/goexif \ - golang:crypto:0e37d00:crypto/golang.org/x/crypto \ - golang:net:26e67e7:net/golang.org/x/net \ - golang:sys:1561086:sys/golang.org/x/sys +GH_TUPLE= HouzuoGuo:tiedot:3.4:tiedot/vendor/github.com/HouzuoGuo/tiedot \ + rwcarlsen:goexif:8d986c0:goexif/vendor/github.com/rwcarlsen/goexif \ + golang:crypto:0e37d00:crypto/vendor/golang.org/x/crypto \ + golang:net:26e67e7:net/vendor/golang.org/x/net \ + golang:sys:1561086:sys/vendor/golang.org/x/sys -PLIST_FILES= bin/onionscan +GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} -do-build: - ${MKDIR} ${WRKSRC}/github.com/${GH_ACCOUNT} - ${RLN} ${WRKSRC} ${WRKSRC}/github.com/${GH_ACCOUNT}/${PORTNAME} - ${RLN} ${WRKSRC} ${WRKSRC}/src - cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} \ - ${GO_CMD} build ${GO_BUILDFLAGS} -o bin/${PORTNAME} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} \ - ${STAGEDIR}/${LOCALBASE}/bin +PLIST_FILES= bin/onionscan .include Index: head/security/ssh-vault/Makefile =================================================================== --- head/security/ssh-vault/Makefile +++ head/security/ssh-vault/Makefile @@ -14,22 +14,15 @@ USES= go USE_GITHUB= yes -GH_TUPLE= golang:crypto:c126467:gocrypto/src/golang.org/x/crypto \ - golang:sys:bd9dbc1:gosys/src/golang.org/x/sys \ - ssh-vault:crypto:ae180e0:crypto/src/github.com/ssh-vault/crypto \ - ssh-vault:ssh2pem:c1edc64:ssh2pem/src/github.com/ssh-vault/ssh2pem +GH_TUPLE= golang:crypto:c126467:gocrypto/vendor/golang.org/x/crypto \ + golang:sys:bd9dbc1:gosys/vendor/golang.org/x/sys \ + ssh-vault:crypto:ae180e0:crypto/vendor/github.com/ssh-vault/crypto \ + ssh-vault:ssh2pem:c1edc64:ssh2pem/vendor/github.com/ssh-vault/ssh2pem GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} +GO_BUILDFLAGS= -ldflags "-s -w -X main.version=${PORTVERSION}" +GO_TARGET= ./cmd/ssh-vault PLIST_FILES= bin/ssh-vault - -do-build: - @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ - ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ - "-s -w -X main.version=${PORTVERSION}" -o ssh-vault cmd/ssh-vault/main.go; - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/ssh-vault/ssh-vault/ssh-vault \ - ${STAGEDIR}${PREFIX}/bin/ssh-vault .include Index: head/security/ssllabs-scan/Makefile =================================================================== --- head/security/ssllabs-scan/Makefile +++ head/security/ssllabs-scan/Makefile @@ -20,11 +20,4 @@ PLIST_FILES= bin/${PORTNAME} -do-build: - @(cd ${GO_WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} -o bin/${PORTNAME}) - -do-install: - ${INSTALL_PROGRAM} ${GO_WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - .include Index: head/security/vuls/Makefile =================================================================== --- head/security/vuls/Makefile +++ head/security/vuls/Makefile @@ -19,117 +19,112 @@ GH_ACCOUNT= future-architect GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} -GH_TUPLE+= Azure:azure-sdk-for-go:v22.2.2:azuresdkforgo/src/github.com/Azure/azure-sdk-for-go -GH_TUPLE+= Azure:go-autorest:v11.2.7:azuregoautorest/src/github.com/Azure/go-autorest -GH_TUPLE+= BurntSushi:toml:v0.3.1:toml/src/github.com/BurntSushi/toml -GH_TUPLE+= RackSec:srslog:a4725f0:srslog/src/github.com/RackSec/srslog -GH_TUPLE+= VividCortex:ewma:v1.1.1:ewma/src/gopkg.in/VividCortex/ewma.v1 -GH_TUPLE+= asaskevich:govalidator:v9:govalidator/src/github.com/asaskevich/govalidator -GH_TUPLE+= aws:aws-sdk-go:v1.15.77:awssdkgo/src/github.com/aws/aws-sdk-go -GH_TUPLE+= boltdb:bolt:v1.3.1:bolt/src/github.com/boltdb/bolt -GH_TUPLE+= cenkalti:backoff:v2.0.0:backoff/src/github.com/cenkalti/backoff -GH_TUPLE+= cheggaaa:pb:v1.0.26:pbv1/src/gopkg.in/cheggaaa/pb.v1 -GH_TUPLE+= cheggaaa:pb:v2.0.6:pb/src/github.com/cheggaaa/pb -GH_TUPLE+= census-ecosystem:opencensus-go-exporter-ocagent:00af367:ocagent/src/contrib.go.opencensus.io/exporter/ocagent -GH_TUPLE+= census-instrumentation:opencensus-go:v0.18.0:opencensusgo/src/go.opencensus.io -GH_TUPLE+= census-instrumentation:opencensus-proto:v0.1.0:opencensusproto/src/github.com/census-instrumentation/opencensus-proto -GH_TUPLE+= dgrijalva:jwt-go:v3.2.0:jwtgo/src/github.com/dgrijalva/jwt-go -GH_TUPLE+= fatih:color:v1.7.0:colorv1/src/github.com/fatih/color -GH_TUPLE+= fsnotify:fsnotify:v1.4.7:fsnotify/src/github.com/fsnotify/fsnotify -GH_TUPLE+= go-redis:redis:v6.14.2:redis/src/github.com/go-redis/redis -GH_TUPLE+= go-sql-driver:mysql:v1.4.1:mysql/src/github.com/go-sql-driver/mysql -GH_TUPLE+= go-stack:stack:v1.8.0:gostack/src/github.com/go-stack/stack -GH_TUPLE+= go-yaml:yaml:v2.2.1:goyaml/src/gopkg.in/yaml.v2 -GH_TUPLE+= golang:crypto:3d3f9f4:crypto/src/golang.org/x/crypto -GH_TUPLE+= golang:net:adae6a3:golangnet/src/golang.org/x/net -GH_TUPLE+= golang:protobuf:aa810b6:protobuf/src/github.com/golang/protobuf -GH_TUPLE+= golang:sync:42b3178:sync/src/golang.org/x/sync -GH_TUPLE+= golang:sys:66b7b13:sys/src/golang.org/x/sys -GH_TUPLE+= golang:text:f21a4df:golangtext/src/golang.org/x/text -GH_TUPLE+= google:go-genproto:b5d4398:gogenproto/src/google.golang.org/genproto -GH_TUPLE+= google:google-api-go-client:83a9d30:googleapigoclient/src/google.golang.org/api -GH_TUPLE+= google:subcommands:46f0354:subcommands/src/github.com/google/subcommands -GH_TUPLE+= gorilla:websocket:v1.4.0:websocket/src/github.com/gorilla/websocket -GH_TUPLE+= gosuri:uitable:36ee7e9:uitable/src/github.com/gosuri/uitable -GH_TUPLE+= grokify:html-strip-tags-go:e9e4496:htmlstriptagsgo/src/github.com/grokify/html-strip-tags-go -GH_TUPLE+= grpc:grpc-go:v1.16.0:grpcgo/src/google.golang.org/grpc -GH_TUPLE+= hashicorp:go-version:v1.0.0:goversion/src/github.com/hashicorp/go-version -GH_TUPLE+= hashicorp:hcl:v1.0.0:hcl/src/github.com/hashicorp/hcl -GH_TUPLE+= hashicorp:uuid:ebb0a03:hashicorpuuid/src/github.com/hashicorp/uuid -GH_TUPLE+= howeyc:gopass:bf9dde6:gopass/src/github.com/howeyc/gopass -GH_TUPLE+= inconshreveable:log15:v2.14:log15/src/github.com/inconshreveable/log15 -GH_TUPLE+= jinzhu:gorm:6ed508e:gorm/src/github.com/jinzhu/gorm -GH_TUPLE+= jinzhu:inflection:0414036:inflection/src/github.com/jinzhu/inflection -GH_TUPLE+= jroimartin:gocui:c055c87:gocui/src/github.com/jroimartin/gocui -GH_TUPLE+= k0kubun:pp:v2.3.0:pp/src/github.com/k0kubun/pp -GH_TUPLE+= knqyf263:go-cpe:659663f:gocpe/src/github.com/knqyf263/go-cpe -GH_TUPLE+= knqyf263:go-deb-version:9865fe1:godebversion/src/github.com/knqyf263/go-deb-version -GH_TUPLE+= knqyf263:go-rpm-version:74609b8:gorpmversion/src/github.com/knqyf263/go-rpm-version -GH_TUPLE+= knqyf263:gost:920046a:gost/src/github.com/knqyf263/gost -GH_TUPLE+= kotakanbe:go-cve-dictionary:9549cd3:gocvedictionary/src/github.com/kotakanbe/go-cve-dictionary -GH_TUPLE+= kotakanbe:go-pingscanner:v0.1.0:gopingscanner/src/github.com/kotakanbe/go-pingscanner -GH_TUPLE+= kotakanbe:goval-dictionary:v0.1.0:govaldictionary/src/github.com/kotakanbe/goval-dictionary -GH_TUPLE+= kotakanbe:logrus-prefixed-formatter:928f735:logrusprefixedformatter/src/github.com/kotakanbe/logrus-prefixed-formatter -GH_TUPLE+= labstack:gommon:7fd9f68:gommon/src/github.com/labstack/gommon -GH_TUPLE+= lib:pq:4ded0e9:pq/src/github.com/lib/pq -GH_TUPLE+= magiconair:properties:v1.8.0:properties/src/github.com/magiconair/properties -GH_TUPLE+= marstr:guid:v1.1.0:guid/src/github.com/marstr/guid -GH_TUPLE+= mattn:go-colorable:v0.0.9:gocolorable/src/github.com/mattn/go-colorable -GH_TUPLE+= mattn:go-isatty:v0.0.4:goisatty/src/github.com/mattn/go-isatty -GH_TUPLE+= mattn:go-runewidth:v0.0.3:gorunewidth/src/github.com/mattn/go-runewidth -GH_TUPLE+= mattn:go-sqlite3:v1.10.0:gosqlite3/src/github.com/mattn/go-sqlite3 -GH_TUPLE+= mgutz:ansi:9520e82:ansi/src/github.com/mgutz/ansi -GH_TUPLE+= mitchellh:go-homedir:v1.0.0:gohomedir/src/github.com/mitchellh/go-homedir -GH_TUPLE+= mitchellh:mapstructure:v1.1.0:mapstructure/src/github.com/mitchellh/mapstructure -GH_TUPLE+= moul:http2curl:9ac6cf4:http2curl/src/github.com/moul/http2curl -GH_TUPLE+= mozqnet:go-exploitdb:48cac6d:goexploitdb/src/github.com/mozqnet/go-exploitdb -GH_TUPLE+= nlopes:slack:v0.4.0:slack/src/github.com/nlopes/slack -GH_TUPLE+= olekukonko:tablewriter:v0.0.1:tablewriter/src/github.com/olekukonko/tablewriter -GH_TUPLE+= nsf:termbox-go:60ab7e3:termboxgo/src/github.com/nsf/termbox-go -GH_TUPLE+= parnurzeal:gorequest:v0.2.15:gorequest/src/github.com/parnurzeal/gorequest -GH_TUPLE+= pelletier:go-toml:v1.2.0:gotoml/src/github.com/pelletier/go-toml -GH_TUPLE+= pkg:errors:v0.8.0:pkgerrors/src/github.com/pkg/errors -GH_TUPLE+= rifflock:lfshook:v2.4:lfshook/src/github.com/rifflock/lfshook -GH_TUPLE+= satori:go.uuid:v1.2.0:gouuid/src/github.com/satori/go.uuid -GH_TUPLE+= sirupsen:logrus:44067ab:logrus/src/github.com/sirupsen/logrus -GH_TUPLE+= spf13:afero:v1.1.2:afero/src/github.com/spf13/afero -GH_TUPLE+= spf13:cast:v1.3.0:cast/src/github.com/spf13/cast -GH_TUPLE+= spf13:jwalterweatherman:v1.0.0:jwalterweatherman/src/github.com/spf13/jwalterweatherman -GH_TUPLE+= spf13:pflag:v1.0.3:pflag/src/github.com/spf13/pflag -GH_TUPLE+= spf13:viper:v1.2.1:viper/src/github.com/spf13/viper -GH_TUPLE+= valyala:bytebufferpool:v1.0.0:bytebufferpool/src/github.com/valyala/bytebufferpool -GH_TUPLE+= valyala:fasttemplate:dcecefd:fasttemplate/src/github.com/valyala/fasttemplate -GH_TUPLE+= ymomoi:goval-parser:0a0be1d:govalparser/src/github.com/ymomoi/goval-parser +GH_TUPLE+= Azure:azure-sdk-for-go:v22.2.2:azuresdkforgo/vendor/github.com/Azure/azure-sdk-for-go +GH_TUPLE+= Azure:go-autorest:v11.2.7:azuregoautorest/vendor/github.com/Azure/go-autorest +GH_TUPLE+= BurntSushi:toml:v0.3.1:toml/vendor/github.com/BurntSushi/toml +GH_TUPLE+= RackSec:srslog:a4725f0:srslog/vendor/github.com/RackSec/srslog +GH_TUPLE+= VividCortex:ewma:v1.1.1:ewma/vendor/gopkg.in/VividCortex/ewma.v1 +GH_TUPLE+= asaskevich:govalidator:v9:govalidator/vendor/github.com/asaskevich/govalidator +GH_TUPLE+= aws:aws-sdk-go:v1.15.77:awssdkgo/vendor/github.com/aws/aws-sdk-go +GH_TUPLE+= boltdb:bolt:v1.3.1:bolt/vendor/github.com/boltdb/bolt +GH_TUPLE+= cenkalti:backoff:v2.0.0:backoff/vendor/github.com/cenkalti/backoff +GH_TUPLE+= cheggaaa:pb:v1.0.26:pbv1/vendor/gopkg.in/cheggaaa/pb.v1 +GH_TUPLE+= cheggaaa:pb:v2.0.6:pb/vendor/github.com/cheggaaa/pb +GH_TUPLE+= census-ecosystem:opencensus-go-exporter-ocagent:00af367:ocagent/vendor/contrib.go.opencensus.io/exporter/ocagent +GH_TUPLE+= census-instrumentation:opencensus-go:v0.18.0:opencensusgo/vendor/go.opencensus.io +GH_TUPLE+= census-instrumentation:opencensus-proto:v0.1.0:opencensusproto/vendor/github.com/census-instrumentation/opencensus-proto +GH_TUPLE+= dgrijalva:jwt-go:v3.2.0:jwtgo/vendor/github.com/dgrijalva/jwt-go +GH_TUPLE+= fatih:color:v1.7.0:colorv1/vendor/github.com/fatih/color +GH_TUPLE+= fsnotify:fsnotify:v1.4.7:fsnotify/vendor/github.com/fsnotify/fsnotify +GH_TUPLE+= go-redis:redis:v6.14.2:redis/vendor/github.com/go-redis/redis +GH_TUPLE+= go-sql-driver:mysql:v1.4.1:mysql/vendor/github.com/go-sql-driver/mysql +GH_TUPLE+= go-stack:stack:v1.8.0:gostack/vendor/github.com/go-stack/stack +GH_TUPLE+= go-yaml:yaml:v2.2.1:goyaml/vendor/gopkg.in/yaml.v2 +GH_TUPLE+= golang:crypto:3d3f9f4:crypto/vendor/golang.org/x/crypto +GH_TUPLE+= golang:net:adae6a3:golangnet/vendor/golang.org/x/net +GH_TUPLE+= golang:protobuf:aa810b6:protobuf/vendor/github.com/golang/protobuf +GH_TUPLE+= golang:sync:42b3178:sync/vendor/golang.org/x/sync +GH_TUPLE+= golang:sys:66b7b13:sys/vendor/golang.org/x/sys +GH_TUPLE+= golang:text:f21a4df:golangtext/vendor/golang.org/x/text +GH_TUPLE+= google:go-genproto:b5d4398:gogenproto/vendor/google.golang.org/genproto +GH_TUPLE+= google:google-api-go-client:83a9d30:googleapigoclient/vendor/google.golang.org/api +GH_TUPLE+= google:subcommands:46f0354:subcommands/vendor/github.com/google/subcommands +GH_TUPLE+= gorilla:websocket:v1.4.0:websocket/vendor/github.com/gorilla/websocket +GH_TUPLE+= gosuri:uitable:36ee7e9:uitable/vendor/github.com/gosuri/uitable +GH_TUPLE+= grokify:html-strip-tags-go:e9e4496:htmlstriptagsgo/vendor/github.com/grokify/html-strip-tags-go +GH_TUPLE+= grpc:grpc-go:v1.16.0:grpcgo/vendor/google.golang.org/grpc +GH_TUPLE+= hashicorp:go-version:v1.0.0:goversion/vendor/github.com/hashicorp/go-version +GH_TUPLE+= hashicorp:hcl:v1.0.0:hcl/vendor/github.com/hashicorp/hcl +GH_TUPLE+= hashicorp:uuid:ebb0a03:hashicorpuuid/vendor/github.com/hashicorp/uuid +GH_TUPLE+= howeyc:gopass:bf9dde6:gopass/vendor/github.com/howeyc/gopass +GH_TUPLE+= inconshreveable:log15:v2.14:log15/vendor/github.com/inconshreveable/log15 +GH_TUPLE+= jinzhu:gorm:6ed508e:gorm/vendor/github.com/jinzhu/gorm +GH_TUPLE+= jinzhu:inflection:0414036:inflection/vendor/github.com/jinzhu/inflection +GH_TUPLE+= jroimartin:gocui:c055c87:gocui/vendor/github.com/jroimartin/gocui +GH_TUPLE+= k0kubun:pp:v2.3.0:pp/vendor/github.com/k0kubun/pp +GH_TUPLE+= knqyf263:go-cpe:659663f:gocpe/vendor/github.com/knqyf263/go-cpe +GH_TUPLE+= knqyf263:go-deb-version:9865fe1:godebversion/vendor/github.com/knqyf263/go-deb-version +GH_TUPLE+= knqyf263:go-rpm-version:74609b8:gorpmversion/vendor/github.com/knqyf263/go-rpm-version +GH_TUPLE+= knqyf263:gost:920046a:gost/vendor/github.com/knqyf263/gost +GH_TUPLE+= kotakanbe:go-cve-dictionary:9549cd3:gocvedictionary/vendor/github.com/kotakanbe/go-cve-dictionary +GH_TUPLE+= kotakanbe:go-pingscanner:v0.1.0:gopingscanner/vendor/github.com/kotakanbe/go-pingscanner +GH_TUPLE+= kotakanbe:goval-dictionary:v0.1.0:govaldictionary/vendor/github.com/kotakanbe/goval-dictionary +GH_TUPLE+= kotakanbe:logrus-prefixed-formatter:928f735:logrusprefixedformatter/vendor/github.com/kotakanbe/logrus-prefixed-formatter +GH_TUPLE+= labstack:gommon:7fd9f68:gommon/vendor/github.com/labstack/gommon +GH_TUPLE+= lib:pq:4ded0e9:pq/vendor/github.com/lib/pq +GH_TUPLE+= magiconair:properties:v1.8.0:properties/vendor/github.com/magiconair/properties +GH_TUPLE+= marstr:guid:v1.1.0:guid/vendor/github.com/marstr/guid +GH_TUPLE+= mattn:go-colorable:v0.0.9:gocolorable/vendor/github.com/mattn/go-colorable +GH_TUPLE+= mattn:go-isatty:v0.0.4:goisatty/vendor/github.com/mattn/go-isatty +GH_TUPLE+= mattn:go-runewidth:v0.0.3:gorunewidth/vendor/github.com/mattn/go-runewidth +GH_TUPLE+= mattn:go-sqlite3:v1.10.0:gosqlite3/vendor/github.com/mattn/go-sqlite3 +GH_TUPLE+= mgutz:ansi:9520e82:ansi/vendor/github.com/mgutz/ansi +GH_TUPLE+= mitchellh:go-homedir:v1.0.0:gohomedir/vendor/github.com/mitchellh/go-homedir +GH_TUPLE+= mitchellh:mapstructure:v1.1.0:mapstructure/vendor/github.com/mitchellh/mapstructure +GH_TUPLE+= moul:http2curl:9ac6cf4:http2curl/vendor/github.com/moul/http2curl +GH_TUPLE+= mozqnet:go-exploitdb:48cac6d:goexploitdb/vendor/github.com/mozqnet/go-exploitdb +GH_TUPLE+= nlopes:slack:v0.4.0:slack/vendor/github.com/nlopes/slack +GH_TUPLE+= olekukonko:tablewriter:v0.0.1:tablewriter/vendor/github.com/olekukonko/tablewriter +GH_TUPLE+= nsf:termbox-go:60ab7e3:termboxgo/vendor/github.com/nsf/termbox-go +GH_TUPLE+= parnurzeal:gorequest:v0.2.15:gorequest/vendor/github.com/parnurzeal/gorequest +GH_TUPLE+= pelletier:go-toml:v1.2.0:gotoml/vendor/github.com/pelletier/go-toml +GH_TUPLE+= pkg:errors:v0.8.0:pkgerrors/vendor/github.com/pkg/errors +GH_TUPLE+= rifflock:lfshook:v2.4:lfshook/vendor/github.com/rifflock/lfshook +GH_TUPLE+= satori:go.uuid:v1.2.0:gouuid/vendor/github.com/satori/go.uuid +GH_TUPLE+= sirupsen:logrus:44067ab:logrus/vendor/github.com/sirupsen/logrus +GH_TUPLE+= spf13:afero:v1.1.2:afero/vendor/github.com/spf13/afero +GH_TUPLE+= spf13:cast:v1.3.0:cast/vendor/github.com/spf13/cast +GH_TUPLE+= spf13:jwalterweatherman:v1.0.0:jwalterweatherman/vendor/github.com/spf13/jwalterweatherman +GH_TUPLE+= spf13:pflag:v1.0.3:pflag/vendor/github.com/spf13/pflag +GH_TUPLE+= spf13:viper:v1.2.1:viper/vendor/github.com/spf13/viper +GH_TUPLE+= valyala:bytebufferpool:v1.0.0:bytebufferpool/vendor/github.com/valyala/bytebufferpool +GH_TUPLE+= valyala:fasttemplate:dcecefd:fasttemplate/vendor/github.com/valyala/fasttemplate +GH_TUPLE+= ymomoi:goval-parser:0a0be1d:govalparser/vendor/github.com/ymomoi/goval-parser +GO_BUILDFLAGS= -ldflags "-X main.version=${PORTVERSION}" + PLIST_FILES= bin/${PORTNAME} \ "@sample ${ETCDIR}/config.toml.sample" post-patch: @${REINPLACE_CMD} -e 's|Sirupsen|sirupsen|' \ - ${WRKSRC}/src/github.com/rifflock/lfshook/lfshook.go + ${WRKSRC}/vendor/github.com/rifflock/lfshook/lfshook.go @${REINPLACE_CMD} -e 's|"gopkg.in/cheggaaa/pb.v2/termutil"|"github.com/cheggaaa/pb/termutil"|' \ - ${WRKSRC}/src/github.com/cheggaaa/pb/pb.go + ${WRKSRC}/vendor/github.com/cheggaaa/pb/pb.go @${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|' \ ${WRKSRC}/commands/configtest.go \ ${WRKSRC}/commands/report.go \ ${WRKSRC}/commands/scan.go @${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-runewidth.v0|github.com/mattn/go-runewidth|' \ - ${WRKSRC}/src/github.com/cheggaaa/pb/util.go + ${WRKSRC}/vendor/github.com/cheggaaa/pb/util.go @${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-colorable.v0|github.com/mattn/go-colorable|' \ - ${WRKSRC}/src/github.com/cheggaaa/pb/pb.go + ${WRKSRC}/vendor/github.com/cheggaaa/pb/pb.go @${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-isatty.v0|github.com/mattn/go-isatty|' \ - ${WRKSRC}/src/github.com/cheggaaa/pb/pb.go + ${WRKSRC}/vendor/github.com/cheggaaa/pb/pb.go @${REINPLACE_CMD} -e 's|gopkg.in/fatih/color.v1|github.com/fatih/color|' \ - ${WRKSRC}/src/github.com/cheggaaa/pb/template.go + ${WRKSRC}/vendor/github.com/cheggaaa/pb/template.go -do-build: - @cd ${GO_WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} \ - ${GO_CMD} build -v -x -ldflags "-X main.version=${PORTVERSION}" \ - -o ${WRKSRC}/${PORTNAME} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/config.toml.sample ${STAGEDIR}${ETCDIR} Index: head/shells/antibody/Makefile =================================================================== --- head/shells/antibody/Makefile +++ head/shells/antibody/Makefile @@ -15,29 +15,21 @@ RUN_DEPENDS= git:devel/git \ zsh:shells/zsh -USES= go +USES= go:modules PLIST_FILES= bin/antibody USE_GITHUB= yes GH_ACCOUNT= getantibody -GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} # Not needed: go-spew, go-difflib -GH_TUPLE= alecthomas:kingpin:a39589:kingpin/src/github.com/alecthomas/kingpin \ - alecthomas:template:a0175e:tempalte/src/github.com/alecthomas/template \ - alecthomas:units:2efee8:units/src/github.com/alecthomas/units \ - caarlos0:gohome:75f08ebc:gohome/src/github.com/caarlos0/gohome \ - getantibody:folder:v1.0.0:folder/src/github.com/getantibody/folder \ - golang:crypto:1a580b:crypto/src/golang.org/x/crypto \ - golang:net:2491c5:net/src/golang.org/x/net \ - golang:sync:1d60e4:sync/src/golang.org/x/sync \ - golang:sys:7c87d1:sys/src/golang.org/x/sys - -do-build: - ${RM} ${WRKSRC}/go.mod - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/antibody-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/antibody +GH_TUPLE= alecthomas:kingpin:a39589:kingpin/vendor/github.com/alecthomas/kingpin \ + alecthomas:template:a0175e:tempalte/vendor/github.com/alecthomas/template \ + alecthomas:units:2efee8:units/vendor/github.com/alecthomas/units \ + caarlos0:gohome:75f08ebc:gohome/vendor/github.com/caarlos0/gohome \ + getantibody:folder:v1.0.0:folder/vendor/github.com/getantibody/folder \ + golang:crypto:1a580b:crypto/vendor/golang.org/x/crypto \ + golang:net:2491c5:net/vendor/golang.org/x/net \ + golang:sync:1d60e4:sync/vendor/golang.org/x/sync \ + golang:sys:7c87d1:sys/vendor/golang.org/x/sys .include