Index: Mk/Uses/go.mk =================================================================== --- Mk/Uses/go.mk (revision 505208) +++ Mk/Uses/go.mk (working copy) @@ -5,11 +5,17 @@ # # Feature: go # Usage: USES=go -# Valid ARGS: (none), modules +# Valid ARGS: (none), modules, no_targets, run # # (none) Setup GOPATH and build in GOPATH mode. # modules If the upstream uses Go modules, this can be set to build # in modules-aware mode. +# no_targets Indicates that Go is needed at build time as a part of +# make/CMake build. This will setup build environment like +# GO_ENV, GO_BUILDFLAGS but will not create post-extract, do-build +# and do-install targets. +# run Indicates that Go is needed at run time and adds it to +# RUN_DEPENDS. # # You can set the following variables to control the process. # @@ -40,7 +46,7 @@ # The Go port to use. By default this is lang/go but can be set # to lang/go-devel in make.conf for testing with future Go versions. # -# This variable should not be set by individual ports! +# This variable must not be set by individual ports! # # MAINTAINER: jlaffaye@FreeBSD.org @@ -47,8 +53,8 @@ .if !defined(_INCLUDE_USES_GO_MK) _INCLUDE_USES_GO_MK= yes -.if !empty(go_ARGS) && ${go_ARGS:Nmodules} -IGNORE= USES=go only accepts no arguments or 'modules' +.if !empty(go_ARGS:Nmodules:Nno_targets:Nrun) +IGNORE= USES=go has invalid arguments: ${go_ARGS:Nmodules:Nno_targets:Nrun} .endif # Settable variables @@ -91,6 +97,9 @@ GO_PORT?= lang/go BUILD_DEPENDS+= ${GO_CMD}:${GO_PORT} +.if ${go_ARGS:Mrun} +RUN_DEPENDS+= ${GO_CMD}:${GO_PORT} +.endif PLIST_SUB+= GO_PKGNAME=${GO_PKGNAME} _USES_POST+= go @@ -105,13 +114,13 @@ @${LN} -sf ${WRKSRC} ${GO_WRKSRC} .endif -.if !target(do-build) +.if !target(do-build) && empty(go_ARGS:Mno_targets) do-build: (cd ${GO_WRKSRC}; \ ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install ${GO_BUILDFLAGS} ${GO_TARGET}) .endif -.if !target(do-install) +.if !target(do-install) && empty(go_ARGS:Mno_targets) do-install: .for _TARGET in ${GO_TARGET} ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/${_TARGET:T} ${STAGEDIR}${PREFIX}/bin Index: databases/cayley/Makefile =================================================================== --- databases/cayley/Makefile (revision 505208) +++ databases/cayley/Makefile (working copy) @@ -14,7 +14,7 @@ BROKEN_i386= gopkg.in/mgo.v2/bson/json.go:320:7: constant 9007199254740992 overflows int -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME}graph Index: databases/cockroach/Makefile =================================================================== --- databases/cockroach/Makefile (revision 505208) +++ databases/cockroach/Makefile (working copy) @@ -18,10 +18,9 @@ BUILD_DEPENDS= autoconf:devel/autoconf \ bash:shells/bash \ - cmake:devel/cmake \ - go:lang/go + cmake:devel/cmake -USES= gmake libedit +USES= gmake go libedit USE_RC_SUBR= cockroach Index: databases/go-carbon/Makefile =================================================================== --- databases/go-carbon/Makefile (revision 505208) +++ databases/go-carbon/Makefile (working copy) @@ -12,8 +12,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -BUILD_DEPENDS= go>=1.8:lang/go - USES= go USE_GITHUB= yes Index: databases/influxdb/Makefile =================================================================== --- databases/influxdb/Makefile (revision 505208) +++ databases/influxdb/Makefile (working copy) @@ -14,7 +14,7 @@ ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 ONLY_FOR_ARCHS_REASON= depends on go which is not supported in this architecture -BUILD_DEPENDS= go>=1.10.3:lang/go +USES= go USE_RC_SUBR= influxd Index: databases/mongodb34-tools/Makefile =================================================================== --- databases/mongodb34-tools/Makefile (revision 505208) +++ databases/mongodb34-tools/Makefile (working copy) @@ -15,10 +15,8 @@ BROKEN_SSL_REASON_libressl= could not determine kind of name for C.EVP_sha BROKEN_SSL_REASON_libressl-devel= ${BROKEN_SSL_REASON_libressl} -BUILD_DEPENDS= go>0:lang/go +USES= go localbase -USES= localbase - USE_GITHUB= yes GH_ACCOUNT= mongodb GH_PROJECT= mongo-tools Index: databases/mongodb36-tools/Makefile =================================================================== --- databases/mongodb36-tools/Makefile (revision 505208) +++ databases/mongodb36-tools/Makefile (working copy) @@ -17,11 +17,9 @@ BROKEN_SSL_REASON_libressl= could not determine kind of name for C.EVP_sha BROKEN_SSL_REASON_libressl-devel= ${BROKEN_SSL_REASON_libressl} -BUILD_DEPENDS= go>0:lang/go - CONFLICTS_INSTALL= mongodb mongodb[32-34]-tools -USES= localbase +USES= go localbase USE_GITHUB= yes GH_ACCOUNT= mongodb Index: databases/pgmetrics/Makefile =================================================================== --- databases/pgmetrics/Makefile (revision 505208) +++ databases/pgmetrics/Makefile (working copy) @@ -11,9 +11,10 @@ LICENSE= APACHE20 +USES= go + USE_GITHUB= yes -BUILD_DEPENDS= go>=1.9:lang/go GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} GH_ACCOUNT= rapidloop GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT_DEFAULT} Index: databases/tile38/Makefile =================================================================== --- databases/tile38/Makefile (revision 505208) +++ databases/tile38/Makefile (working copy) @@ -11,10 +11,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go>=1.7:lang/go \ - bash:shells/bash +BUILD_DEPENDS= bash:shells/bash -USES= shebangfix +USES= go shebangfix SHEBANG_FILES= build.sh USE_GITHUB= yes GH_ACCOUNT= tidwall Index: databases/usql/Makefile =================================================================== --- databases/usql/Makefile (revision 505208) +++ databases/usql/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= xo Index: deskutils/chart/Makefile =================================================================== --- deskutils/chart/Makefile (revision 505208) +++ deskutils/chart/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go>=1.10:lang/go +USES= go USE_GITHUB= yes Index: devel/arduino-builder/Makefile =================================================================== --- devel/arduino-builder/Makefile (revision 505208) +++ devel/arduino-builder/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= arduino @@ -27,7 +27,6 @@ TOOLS_RUN_DEPENDS= arduino-tools>=${_COMPAT_VER}:devel/arduino-tools TOOLS_PLIST_FILES= arduino/arduino-builder.options -GO_ENV+= GOPATH=${WRKSRC} _COMPAT_VER= 1.6.12 _IDE_VER= 10612 @@ -42,7 +41,7 @@ ${WRKSRC}/arduino-builder.options do-build: - @( cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GO_ENV} go build arduino.cc/arduino-builder ) + @( cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} go build arduino.cc/arduino-builder ) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} Index: devel/arduinoOTA/Makefile =================================================================== --- devel/arduinoOTA/Makefile (revision 505208) +++ devel/arduinoOTA/Makefile (working copy) @@ -9,7 +9,7 @@ LICENSE= GPLv3 -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= arduino Index: devel/awless/Makefile =================================================================== --- devel/awless/Makefile (revision 505208) +++ devel/awless/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= wallix Index: devel/bloaty/Makefile =================================================================== --- devel/bloaty/Makefile (revision 505208) +++ devel/bloaty/Makefile (working copy) @@ -12,14 +12,13 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go \ - cmake:devel/cmake \ +BUILD_DEPENDS= cmake:devel/cmake \ ninja:devel/ninja LIB_DEPENDS= libre2.so:devel/re2 \ libcapstone.so:devel/capstone4 \ libprotobuf.so:devel/protobuf -USES= cmake pkgconfig +USES= cmake go:no_targets pkgconfig USE_GITHUB= yes GH_ACCOUNT= google Index: devel/git-codereview/Makefile =================================================================== --- devel/git-codereview/Makefile (revision 505208) +++ devel/git-codereview/Makefile (working copy) @@ -7,7 +7,7 @@ MAINTAINER= swills@FreeBSD.org COMMENT= Command-line tool for working with Gerrit -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= golang Index: devel/git-town/Makefile =================================================================== --- devel/git-town/Makefile (revision 505208) +++ devel/git-town/Makefile (working copy) @@ -11,9 +11,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go RUN_DEPENDS= git:devel/git +USES= go + USE_GITHUB= yes GH_ACCOUNT= Originate GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} Index: devel/gitaly/Makefile =================================================================== --- devel/gitaly/Makefile (revision 505208) +++ devel/gitaly/Makefile (working copy) @@ -28,13 +28,12 @@ rubygem-rbtrace>0:devel/rubygem-rbtrace \ rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \ rubygem-google-protobuf371>=3.7.1:devel/rubygem-google-protobuf371 -BUILD_DEPENDS= go>=1.11:lang/go \ - gem:devel/ruby-gems \ +BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} \ gitlab-shell>=6.0.4:devel/gitlab-shell -USES= gmake +USES= gmake go:no_targets USE_RUBY= yes USE_GITLAB= yes Index: devel/gitlab-runner/Makefile =================================================================== --- devel/gitlab-runner/Makefile (revision 505208) +++ devel/gitlab-runner/Makefile (working copy) @@ -18,12 +18,13 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go \ - go-bindata:devel/go-bindata +BUILD_DEPENDS= go-bindata:devel/go-bindata RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \ bash:shells/bash \ git:devel/git +USES= go + USE_GITLAB= yes # Find tags here: Index: devel/gitlab-shell/Makefile =================================================================== --- devel/gitlab-shell/Makefile (revision 505208) +++ devel/gitlab-shell/Makefile (working copy) @@ -10,9 +10,10 @@ LICENSE= MIT -BUILD_DEPENDS= gem:devel/ruby-gems \ - go>=1.5.3:lang/go +BUILD_DEPENDS= gem:devel/ruby-gems +USES= go + USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-shell/tags Index: devel/go-bindata/Makefile =================================================================== --- devel/go-bindata/Makefile (revision 505208) +++ devel/go-bindata/Makefile (working copy) @@ -8,7 +8,7 @@ MAINTAINER= swills@FreeBSD.org COMMENT= Generates Go code from any file -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= jteeuwen Index: devel/go-protobuf/Makefile =================================================================== --- devel/go-protobuf/Makefile (revision 505208) +++ devel/go-protobuf/Makefile (working copy) @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= gogo Index: devel/go-tools/Makefile =================================================================== --- devel/go-tools/Makefile (revision 505208) +++ devel/go-tools/Makefile (working copy) @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_TUPLE= golang:tools:bfb5194:DEFAULT/src/golang.org/x/tools \ Index: devel/gogs/Makefile =================================================================== --- devel/gogs/Makefile (revision 505208) +++ devel/gogs/Makefile (working copy) @@ -11,10 +11,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go RUN_DEPENDS= git:devel/git \ bash:shells/bash +USES= go + USE_GITHUB= yes GH_ACCOUNT= gogs GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} Index: devel/goprotobuf/Makefile =================================================================== --- devel/goprotobuf/Makefile (revision 505208) +++ devel/goprotobuf/Makefile (working copy) @@ -13,9 +13,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go RUN_DEPENDS= protoc:devel/protobuf +USES= go + USE_GITHUB= yes GH_ACCOUNT= golang GH_PROJECT= protobuf Index: devel/gpm/Makefile =================================================================== --- devel/gpm/Makefile (revision 505208) +++ devel/gpm/Makefile (working copy) @@ -12,9 +12,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= bash:shells/bash \ - go:lang/go +RUN_DEPENDS= bash:shells/bash +USES= go:run + USE_GITHUB= yes GH_ACCOUNT= pote Index: devel/grpc/Makefile =================================================================== --- devel/grpc/Makefile (revision 505208) +++ devel/grpc/Makefile (working copy) @@ -13,13 +13,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go \ - yasm:devel/yasm +BUILD_DEPENDS= yasm:devel/yasm LIB_DEPENDS= libgflags.so:devel/gflags \ libprotobuf.so:devel/protobuf \ libcares.so:dns/c-ares -USES= cmake localbase:ldflags perl5 pkgconfig ssl +USES= cmake go:no_targets localbase:ldflags perl5 pkgconfig ssl + USE_GITHUB= yes GH_TUPLE= google:benchmark:v1.4.1:benchmark/third_party/benchmark USE_LDCONFIG= yes Index: devel/grumpy/Makefile =================================================================== --- devel/grumpy/Makefile (revision 505208) +++ devel/grumpy/Makefile (working copy) @@ -9,14 +9,11 @@ BROKEN_i386= constant 2147762812 overflows int -BUILD_DEPENDS= go:lang/go -RUN_DEPENDS:= ${BUILD_DEPENDS} - USE_GITHUB= yes GH_ACCOUNT= google GH_TAGNAME= 3ec8795 -USES= gmake python:2.7 shebangfix +USES= gmake go:no_targets,run python:2.7 shebangfix SHEBANG_FILES= tools/benchcmp tools/coverparse tools/diffrange tools/grumpc BINARY_ALIAS= python=${PYTHON_CMD} Index: devel/grv/Makefile =================================================================== --- devel/grv/Makefile (revision 505208) +++ devel/grv/Makefile (working copy) @@ -12,10 +12,9 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go LIB_DEPENDS= libgit2.so:devel/libgit2 -USES= ncurses pkgconfig readline:port +USES= go ncurses pkgconfig readline:port USE_GITHUB= yes GH_ACCOUNT= rgburke GH_SUBDIR= src/github.com/rgburke/grv Index: devel/gvp/Makefile =================================================================== --- devel/gvp/Makefile (revision 505208) +++ devel/gvp/Makefile (working copy) @@ -12,10 +12,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE -RUN_DEPENDS= bash:shells/bash \ - go:lang/go +RUN_DEPENDS= bash:shells/bash -USES= shebangfix +USES= go:run shebangfix SHEBANG_FILES= bin/gvp Index: devel/jiri/Makefile =================================================================== --- devel/jiri/Makefile (revision 505208) +++ devel/jiri/Makefile (working copy) @@ -13,11 +13,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/go/src/fuchsia.googlesource.com/jiri/LICENSE -BUILD_DEPENDS= go:lang/go \ - cmake:devel/cmake \ +BUILD_DEPENDS= cmake:devel/cmake \ ninja:devel/ninja RUN_DEPENDS= git:devel/git +USES= go + GITHASH= 56b2a541f92f3bd9d28b29e1cbcb16f96d6bc6c1 TIMESTAMP= 2019-01-03T00:00:00.000000 EXTRACT_AFTER_ARGS= -s "!^!${DISTNAME}/go/src/fuchsia.googlesource.com/jiri/!" @@ -28,7 +29,7 @@ do-build: cd ${WRKSRC}/go/src/fuchsia.googlesource.com/jiri && \ - ${SETENV} GOPATH=${WRKSRC}/go \ + ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC}/go \ go build -ldflags "-s -w -X \"fuchsia.googlesource.com/jiri/version.GitCommit=${GITHASH}\" -X \"fuchsia.googlesource.com/jiri/version.BuildTime=${TIMESTAMP}\"" -a -o jiri fuchsia.googlesource.com/jiri/cmd/jiri do-install: Index: devel/lab/Makefile =================================================================== --- devel/lab/Makefile (revision 505208) +++ devel/lab/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go>=1.10,1:lang/go +USES= go OPTIONS_DEFINE= GIT_SUBVERSION Index: devel/liteide/Makefile =================================================================== --- devel/liteide/Makefile (revision 505208) +++ devel/liteide/Makefile (working copy) @@ -11,10 +11,7 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSE.LGPL -BUILD_DEPENDS= go:lang/go -RUN_DEPENDS= go:lang/go - -USES= gl qmake qt:5 +USES= gl go:no_targets,run qmake qt:5 USE_GL= gl USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} USE_QT= buildtools_build core gui network printsupport widgets xml Index: devel/loccount/Makefile =================================================================== --- devel/loccount/Makefile (revision 505208) +++ devel/loccount/Makefile (working copy) @@ -10,7 +10,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= go:lang/go +USES= go USE_GITLAB= yes GL_ACCOUNT= esr Index: devel/mage/Makefile =================================================================== --- devel/mage/Makefile (revision 505208) +++ devel/mage/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= magefile Index: devel/pprof/Makefile =================================================================== --- devel/pprof/Makefile (revision 505208) +++ devel/pprof/Makefile (working copy) @@ -10,7 +10,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= google Index: dns/amass/Makefile =================================================================== --- dns/amass/Makefile (revision 505208) +++ dns/amass/Makefile (working copy) @@ -10,7 +10,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= nodefault # main code is in GH_TUPLE, otherwise build fails with circular dependency errors GH_ACCOUNT= OWASP Index: dns/knot-resolver/Makefile =================================================================== --- dns/knot-resolver/Makefile (revision 505208) +++ dns/knot-resolver/Makefile (working copy) @@ -64,7 +64,7 @@ DOXYGEN_MAKE_ARGS_OFF= HAS_doxygen=no GO_DESC= go -GO_BUILD_DEPENDS= go>=1.5:lang/go +GO_USES= go:no_targets GO_MAKE_ARGS= HAS_go=yes GO_MAKE_ARGS_OFF= HAS_go=no Index: editors/micro/Makefile =================================================================== --- editors/micro/Makefile (revision 505208) +++ editors/micro/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= zyedidia Index: finance/fixc/Makefile =================================================================== --- finance/fixc/Makefile (revision 505208) +++ finance/fixc/Makefile (working copy) @@ -8,7 +8,7 @@ MAINTAINER= blttll@gmail.com COMMENT= Simple Financial Information eXchange (FIX) protocol console client -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go +USES= go PLIST_FILES= bin/fixc USE_GITHUB= yes Index: misc/cryptoballot/Makefile =================================================================== --- misc/cryptoballot/Makefile (revision 505208) +++ misc/cryptoballot/Makefile (working copy) @@ -9,7 +9,7 @@ LICENSE= AGPLv3 -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_TAGNAME= 3753e1b Index: misc/exercism/Makefile =================================================================== --- misc/exercism/Makefile (revision 505208) +++ misc/exercism/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go +USES= go USE_GITHUB= yes Index: net/clash/Makefile =================================================================== --- net/clash/Makefile (revision 505208) +++ net/clash/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= Dreamacro Index: net/geoipupdate/Makefile =================================================================== --- net/geoipupdate/Makefile (revision 505208) +++ net/geoipupdate/Makefile (working copy) @@ -14,10 +14,9 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT -BUILD_DEPENDS= go:lang/go RUN_DEPENDS= ca_root_nss>=3:security/ca_root_nss -USES= gmake +USES= gmake go:no_targets USE_GITHUB= yes GH_ACCOUNT= maxmind Index: net/goreplay/Makefile =================================================================== --- net/goreplay/Makefile (revision 505208) +++ net/goreplay/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= buger Index: net/grpcurl/Makefile =================================================================== --- net/grpcurl/Makefile (revision 505208) +++ net/grpcurl/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= fullstorydev Index: net/nncp/Makefile =================================================================== --- net/nncp/Makefile (revision 505208) +++ net/nncp/Makefile (working copy) @@ -11,9 +11,7 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= go:lang/go - -USES= tar:xz +USES= go:no_targets tar:xz MAKEFILE= BSDmakefile USE_RC_SUBR= nncp-caller nncp-daemon nncp-toss INSTALL_TARGET= install-strip Index: net/nsq/Makefile =================================================================== --- net/nsq/Makefile (revision 505208) +++ net/nsq/Makefile (working copy) @@ -12,8 +12,6 @@ ONLY_FOR_ARCHS= amd64 -BUILD_DEPENDS= go>=1.7:lang/go - USES= compiler go USE_RC_SUBR= nsqd nsqlookupd nsqadmin Index: net/syncthing/Makefile =================================================================== --- net/syncthing/Makefile (revision 505208) +++ net/syncthing/Makefile (working copy) @@ -13,7 +13,7 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/${PORTNAME}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go +USES= go USE_RC_SUBR= syncthing syncthing-discosrv syncthing-relaysrv syncthing-relaypoolsrv Index: net/wireguard-go/Makefile =================================================================== --- net/wireguard-go/Makefile (revision 505208) +++ net/wireguard-go/Makefile (working copy) @@ -12,16 +12,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= go:lang/go +USES= gmake go:modules,no_targets tar:xz -USES= gmake tar:xz - USE_GITHUB= nodefault GH_TUPLE= golang:crypto:b7391e95e576:crypto/vendor/golang.org/x/crypto \ golang:net:1272bf9dcd53:net/vendor/golang.org/x/net \ golang:sys:f7bb7a8bee54:sys/vendor/golang.org/x/sys -MAKE_ENV+= GOFLAGS=-mod=vendor +MAKE_ENV+= GOFLAGS="${GO_BUILDFLAGS}" PLIST_FILES= bin/${PORTNAME} Index: net-im/coyim/Makefile =================================================================== --- net-im/coyim/Makefile (revision 505208) +++ net-im/coyim/Makefile (working copy) @@ -12,11 +12,10 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -USES= gnome pkgconfig shebangfix +USES= gnome go pkgconfig shebangfix USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 pango Index: net-im/matterbridge/Makefile =================================================================== --- net-im/matterbridge/Makefile (revision 505208) +++ net-im/matterbridge/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= 42wim Index: net-im/matterircd/Makefile =================================================================== --- net-im/matterircd/Makefile (revision 505208) +++ net-im/matterircd/Makefile (working copy) @@ -13,7 +13,7 @@ ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 -BUILD_DEPENDS= go>=1.8:lang/go +USES= go USE_RC_SUBR= matterircd Index: net-im/slack-term/Makefile =================================================================== --- net-im/slack-term/Makefile (revision 505208) +++ net-im/slack-term/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= erroneousboat Index: net-im/ssh-chat/Makefile =================================================================== --- net-im/ssh-chat/Makefile (revision 505208) +++ net-im/ssh-chat/Makefile (working copy) @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= nodefault # the main code is in GH_TUPLE GH_ACCOUNT= shazow Index: net-im/xmpp-client/Makefile =================================================================== --- net-im/xmpp-client/Makefile (revision 505208) +++ net-im/xmpp-client/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_TUPLE= agl:xmpp-client:3030ad4:DEFAULT/src/github.com/agl/xmpp-client \ Index: net-mgmt/carbon-relay-ng/Makefile =================================================================== --- net-mgmt/carbon-relay-ng/Makefile (revision 505208) +++ net-mgmt/carbon-relay-ng/Makefile (working copy) @@ -10,10 +10,9 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go>=1.8:lang/go \ - go-bindata:devel/go-bindata +BUILD_DEPENDS= go-bindata:devel/go-bindata -USES= gmake +USES= gmake go USE_GITHUB= yes GH_ACCOUNT= graphite-ng Index: net-mgmt/carbonzipper/Makefile =================================================================== --- net-mgmt/carbonzipper/Makefile (revision 505208) +++ net-mgmt/carbonzipper/Makefile (working copy) @@ -10,8 +10,6 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go>=1.8:lang/go - USES= go USE_GITHUB= yes Index: net-mgmt/intel-snap/Makefile =================================================================== --- net-mgmt/intel-snap/Makefile (revision 505208) +++ net-mgmt/intel-snap/Makefile (working copy) @@ -10,7 +10,7 @@ #LICENSE= APACHE2 -BUILD_DEPENDS= go>=1.5:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= stdale Index: net-mgmt/kapacitor/Makefile =================================================================== --- net-mgmt/kapacitor/Makefile (revision 505208) +++ net-mgmt/kapacitor/Makefile (working copy) @@ -14,7 +14,7 @@ ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 -BUILD_DEPENDS= go>=1.6.0:lang/go +USES= go USE_RC_SUBR= kapacitord Index: net-mgmt/telegraf/Makefile =================================================================== --- net-mgmt/telegraf/Makefile (revision 505208) +++ net-mgmt/telegraf/Makefile (working copy) @@ -12,7 +12,7 @@ ONLY_FOR_ARCHS= amd64 i386 armv6 armv7 -BUILD_DEPENDS= go>=1.9:lang/go +USES= go USE_RC_SUBR= telegraf Index: net-p2p/go-ethereum/Makefile =================================================================== --- net-p2p/go-ethereum/Makefile (revision 505208) +++ net-p2p/go-ethereum/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= go>=1.9.2:lang/go +USES= go:no_targets USE_GITHUB= yes GH_ACCOUNT= ethereum Index: print/cloud-print-connector/Makefile =================================================================== --- print/cloud-print-connector/Makefile (revision 505208) +++ print/cloud-print-connector/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= cloud-print-connector PORTVERSION= 1.16 PORTREVISION= 1 +DISTVERSIONPREFIX= v CATEGORIES= print MAINTAINER= swills@FreeBSD.org @@ -11,43 +12,29 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go - LIB_DEPENDS= libcups.so:print/cups \ libavahi-client.so:net/avahi-app \ libavahi-common.so:net/avahi-app -USES= compiler pkgconfig +USES= compiler go pkgconfig USE_GITHUB= yes +GH_ACCOUNT= google +GH_SUBDIR= src/github.com/google/cloud-print-connector +GH_TUPLE= urfave:cli:8e01ec4:cli/vendor/github.com/urfave/cli \ + satori:go.uuid:36e9d2e:gouuid/vendor/github.com/satori/go.uuid \ + coreos:go-systemd:88bfeed:gosystemd/vendor/github.com/coreos/go-systemd \ + golang:oauth2:ef14785:oauth2/vendor/golang.org/x/oauth2 \ + golang:net:039a425:net/vendor/golang.org/x/net \ + mildred:go-xdg:96b70c9:xdg/vendor/launchpad.net/go-xdg/v0 USE_RC_SUBR= gcp-cups-connectord -GH_TUPLE= google:cloud-print-connector:7d5f127:DEFAULT/src/github.com/google/cloud-print-connector \ - urfave:cli:8e01ec4:cli/src/github.com/urfave/cli \ - satori:go.uuid:36e9d2e:gouuid/src/github.com/satori/go.uuid \ - coreos:go-systemd:88bfeed:gosystemd/src/github.com/coreos/go-systemd \ - golang:oauth2:ef14785:oauth2/src/golang.org/x/oauth2 \ - golang:net:039a425:net/src/golang.org/x/net \ - mildred:go-xdg:96b70c9:xdg/src/launchpad.net/go-xdg/v0 -BIN_FILES= gcp-connector-util gcp-cups-connector -PLIST_FILES= ${BIN_FILES:S/^/bin\//} +GO_TARGET= ./gcp-connector-util ./gcp-cups-connector +PLIST_FILES= ${GO_TARGET:S/./bin/} OPTIONS_DEFINE= DOCS PORTDOCS= CONTRIBUTING.md README.md -do-build: -.for bin in ${BIN_FILES} - @cd ${WRKSRC}/src/github.com/google/cloud-print-connector; ${SETENV} \ - ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -o \ - ${WRKSRC}/bin/${bin} ./${bin} -.endfor - -do-install: -.for bin in ${BIN_FILES} - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${bin} \ - ${STAGEDIR}${PREFIX}/bin/${bin} -.endfor - post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} @@ -54,12 +41,4 @@ ${CP} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor -.include - -# golang assumes that if clang is in use, it is called "clang" and not "cc". If -# it's called "cc", go may fail -.if ${COMPILER_TYPE} == clang -BUILD_ENV= CC=clang -.endif - -.include +.include Index: print/cloud-print-connector/distinfo =================================================================== --- print/cloud-print-connector/distinfo (revision 505208) +++ print/cloud-print-connector/distinfo (working copy) @@ -1,6 +1,6 @@ -TIMESTAMP = 1531335199 -SHA256 (google-cloud-print-connector-1.16-7d5f127_GH0.tar.gz) = abd89462880284d8c8d42b6ddd7bf2517881f21ad62619124715c7b4f230ab02 -SIZE (google-cloud-print-connector-1.16-7d5f127_GH0.tar.gz) = 122101 +TIMESTAMP = 1561470998 +SHA256 (google-cloud-print-connector-v1.16_GH0.tar.gz) = e7ef1dbc9e326c59a08fea1a37b62d2e689d2a1aed8c717969be89055c4996c8 +SIZE (google-cloud-print-connector-v1.16_GH0.tar.gz) = 122106 SHA256 (urfave-cli-8e01ec4_GH0.tar.gz) = d8654573173cef6b639f00884c146bdb7f9130817e0b2d3f44d86d701428a63d SIZE (urfave-cli-8e01ec4_GH0.tar.gz) = 64657 SHA256 (satori-go.uuid-36e9d2e_GH0.tar.gz) = aa54b317ac4122e7a4db33f84bac64fa9079637f4fd0517206c06d1aa1341b2d Index: science/molgif/Makefile =================================================================== --- science/molgif/Makefile (revision 505208) +++ science/molgif/Makefile (working copy) @@ -10,7 +10,7 @@ LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= ilyak Index: security/2fa/Makefile =================================================================== --- security/2fa/Makefile (revision 505208) +++ security/2fa/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= rsc Index: security/acmetool/Makefile =================================================================== --- security/acmetool/Makefile (revision 505208) +++ security/acmetool/Makefile (working copy) @@ -10,7 +10,7 @@ LICENSE= MIT -BUILD_DEPENDS= go>=1.8:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= hlandau Index: security/boringssl/Makefile =================================================================== --- security/boringssl/Makefile (revision 505208) +++ security/boringssl/Makefile (working copy) @@ -7,12 +7,10 @@ MAINTAINER= swills@FreeBSD.org COMMENT= Fork of OpenSSL -BUILD_DEPENDS= go:lang/go - USE_GITHUB= yes GH_ACCOUNT= google GH_TAGNAME= 144d924 -USES= cmake:insource localbase perl5 +USES= cmake:insource go:no_targets localbase perl5 CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1 USE_LDCONFIG= yes LDFLAGS+= -Wl,-rpath,${PREFIX}/lib Index: security/govpn/Makefile =================================================================== --- security/govpn/Makefile (revision 505208) +++ security/govpn/Makefile (working copy) @@ -13,9 +13,7 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= go:lang/go - -USES= tar:xz +USES= go:no_targets tar:xz MAKEFILE= BSDmakefile PORTDOCS= AUTHORS INSTALL NEWS NEWS.RU README README.RU THANKS Index: security/honeybadger/Makefile =================================================================== --- security/honeybadger/Makefile (revision 505208) +++ security/honeybadger/Makefile (working copy) @@ -9,7 +9,7 @@ BROKEN= fails to build -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_TUPLE= david415:HoneyBadger:11dc0ca:DEFAULT/src/github.com/david415/HoneyBadger \ Index: security/meek/Makefile =================================================================== --- security/meek/Makefile (revision 505208) +++ security/meek/Makefile (working copy) @@ -14,7 +14,7 @@ LICENSE= CC0-1.0 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= nodefault GH_TUPLE= golang:crypto:c126467:crypto/src/golang.org/x/crypto \ Index: security/onionscan/Makefile =================================================================== --- security/onionscan/Makefile (revision 505208) +++ security/onionscan/Makefile (working copy) @@ -11,8 +11,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go - USES= go USE_GITHUB= yes Index: security/teleport/Makefile =================================================================== --- security/teleport/Makefile (revision 505208) +++ security/teleport/Makefile (working copy) @@ -13,10 +13,9 @@ NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= Uses 64bit types -BUILD_DEPENDS= go:lang/go \ - zip:archivers/zip +BUILD_DEPENDS= zip:archivers/zip -USES= compiler gmake +USES= compiler gmake go USE_GITHUB= yes GH_ACCOUNT= gravitational Index: security/vault/Makefile =================================================================== --- security/vault/Makefile (revision 505208) +++ security/vault/Makefile (working copy) @@ -12,7 +12,7 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go>=1.9:lang/go +USES= go USE_GITHUB= yes GH_TUPLE= hashicorp:${PORTNAME}:${VAULTTAG}:DEFAULT/src/github.com/hashicorp/${PORTNAME} \ Index: sysutils/amazon-ssm-agent/Makefile =================================================================== --- sysutils/amazon-ssm-agent/Makefile (revision 505208) +++ sysutils/amazon-ssm-agent/Makefile (working copy) @@ -10,9 +10,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss +USES= go + USE_GITHUB= yes GH_ACCOUNT= aws GH_SUBDIR= src/github.com/aws/amazon-ssm-agent Index: sysutils/circonus-agent/Makefile =================================================================== --- sysutils/circonus-agent/Makefile (revision 505208) +++ sysutils/circonus-agent/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go>=1.10:lang/go +USES= go USE_GITHUB= yes Index: sysutils/consul/Makefile =================================================================== --- sysutils/consul/Makefile (revision 505208) +++ sysutils/consul/Makefile (working copy) @@ -10,10 +10,8 @@ LICENSE= MPL20 -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go +USES= compiler go -USES= compiler - USE_GITHUB= yes GH_ACCOUNT= hashicorp GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} Index: sysutils/consul-alerts/Makefile =================================================================== --- sysutils/consul-alerts/Makefile (revision 505208) +++ sysutils/consul-alerts/Makefile (working copy) @@ -10,8 +10,6 @@ LICENSE= GPLv2+ -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go - USES= compiler go USE_GITHUB= yes Index: sysutils/consul-replicate/Makefile =================================================================== --- sysutils/consul-replicate/Makefile (revision 505208) +++ sysutils/consul-replicate/Makefile (working copy) @@ -11,10 +11,8 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go +USES= compiler go -USES= compiler - USE_GITHUB= yes GH_ACCOUNT= hashicorp GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} Index: sysutils/consul_exporter/Makefile =================================================================== --- sysutils/consul_exporter/Makefile (revision 505208) +++ sysutils/consul_exporter/Makefile (working copy) @@ -10,10 +10,8 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go +USES= compiler go -USES= compiler - USE_GITHUB= yes GH_ACCOUNT= prometheus GH_SUBDIR= src/github.com/${GH_ACCOUNT}/consul_exporter Index: sysutils/direnv/Makefile =================================================================== --- sysutils/direnv/Makefile (revision 505208) +++ sysutils/direnv/Makefile (working copy) @@ -11,10 +11,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go \ - bash:shells/bash +BUILD_DEPENDS= bash:shells/bash -USES= gmake +USES= gmake go:no_targets USE_GITHUB= yes GH_ACCOUNT= direnv Index: sysutils/docker-freebsd/Makefile =================================================================== --- sysutils/docker-freebsd/Makefile (revision 505208) +++ sysutils/docker-freebsd/Makefile (working copy) @@ -14,13 +14,13 @@ BROKEN= fails to build -BUILD_DEPENDS= go>=1.4:lang/go \ - bash:shells/bash \ +BUILD_DEPENDS= bash:shells/bash \ sqlite3:databases/sqlite3 -RUN_DEPENDS= go>=1.4:lang/go \ - bash:shells/bash \ +RUN_DEPENDS= bash:shells/bash \ sqlite3:databases/sqlite3 +USES= go:run + USE_GITHUB= yes GH_ACCOUNT= kvasdopil GH_PROJECT= docker Index: sysutils/envconsul/Makefile =================================================================== --- sysutils/envconsul/Makefile (revision 505208) +++ sysutils/envconsul/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= hashicorp Index: sysutils/epazote/Makefile =================================================================== --- sysutils/epazote/Makefile (revision 505208) +++ sysutils/epazote/Makefile (working copy) @@ -10,10 +10,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go>=1.7:lang/go +USES= compiler go -USES= compiler - USE_GITHUB= yes GH_TUPLE= epazote:scheduler:0.1.0:scheduler/src/github.com/epazote/scheduler \ go-yaml:yaml:cd8b52f:yaml/src/github.com/go-yaml/yaml Index: sysutils/goawk/Makefile =================================================================== --- sysutils/goawk/Makefile (revision 505208) +++ sysutils/goawk/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/LICENSE.txt -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= nodefault # the main code is in GH_TUPLE GH_ACCOUNT= benhoyt Index: sysutils/gomplate/Makefile =================================================================== --- sysutils/gomplate/Makefile (revision 505208) +++ sysutils/gomplate/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= hairyhenderson Index: sysutils/goss/Makefile =================================================================== --- sysutils/goss/Makefile (revision 505208) +++ sysutils/goss/Makefile (working copy) @@ -12,7 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= go-ps only supports amd64 Index: sysutils/gotop/Makefile =================================================================== --- sysutils/gotop/Makefile (revision 505208) +++ sysutils/gotop/Makefile (working copy) @@ -10,8 +10,6 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go - USES= go USE_GITHUB= yes GH_ACCOUNT= cjbassi Index: sysutils/hfm/Makefile =================================================================== --- sysutils/hfm/Makefile (revision 505208) +++ sysutils/hfm/Makefile (working copy) @@ -13,11 +13,10 @@ # gb 0.4 includes FreeBSD-specific fixes that this port requires # https://github.com/constabulary/gb/issues/506 -BUILD_DEPENDS= go>=1.5:lang/go \ - gb>=0.4:devel/gb \ +BUILD_DEPENDS= gb>=0.4:devel/gb \ ${LOCALBASE}/lib/libucl.a:textproc/libucl -USES= compiler:c++11-lang +USES= compiler:c++11-lang go:no_targets USE_GITHUB= yes GH_ACCOUNT= derekmarcotte Index: sysutils/log-courier/Makefile =================================================================== --- sysutils/log-courier/Makefile (revision 505208) +++ sysutils/log-courier/Makefile (working copy) @@ -12,8 +12,6 @@ BROKEN= fails to build -BUILD_DEPENDS= go:lang/go - USES= go gmake USE_GITHUB= yes GH_ACCOUNT= driskell Index: sysutils/logstash-forwarder/Makefile =================================================================== --- sysutils/logstash-forwarder/Makefile (revision 505208) +++ sysutils/logstash-forwarder/Makefile (working copy) @@ -12,8 +12,6 @@ DEPRECATED= Migrate to sysutils/beats -BUILD_DEPENDS= go:lang/go - USES= go USE_GITHUB= yes GH_ACCOUNT= elasticsearch Index: sysutils/nomad/Makefile =================================================================== --- sysutils/nomad/Makefile (revision 505208) +++ sysutils/nomad/Makefile (working copy) @@ -14,9 +14,7 @@ ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= On i386: go compiler crashes: https://github.com/golang/go/issues/23763 -BUILD_DEPENDS= go:lang/go - -USES= compiler +USES= compiler go USE_GITHUB= yes GH_ACCOUNT= hashicorp GH_SUBDIR= src/github.com/hashicorp/nomad Index: sysutils/serf/Makefile =================================================================== --- sysutils/serf/Makefile (revision 505208) +++ sysutils/serf/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= MPL20 -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes Index: sysutils/sockaddr/Makefile =================================================================== --- sysutils/sockaddr/Makefile (revision 505208) +++ sysutils/sockaddr/Makefile (working copy) @@ -10,7 +10,7 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_SUBDIR= src/github.com/hashicorp/go-sockaddr Index: textproc/consul-template/Makefile =================================================================== --- textproc/consul-template/Makefile (revision 505208) +++ textproc/consul-template/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= MPL20 -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= hashicorp Index: textproc/spiff/Makefile =================================================================== --- textproc/spiff/Makefile (revision 505208) +++ textproc/spiff/Makefile (working copy) @@ -8,7 +8,7 @@ MAINTAINER= swills@FreeBSD.org COMMENT= Declarative YAML templating system tuned for BOSH deployment manifests -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= cloudfoundry-incubator Index: www/carbonapi/Makefile =================================================================== --- www/carbonapi/Makefile (revision 505208) +++ www/carbonapi/Makefile (working copy) @@ -10,10 +10,8 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go>=1.8:lang/go +USES= gmake go -USES= gmake - USE_GITHUB= yes GH_ACCOUNT= go-graphite GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} Index: www/gitlab-pages/Makefile =================================================================== --- www/gitlab-pages/Makefile (revision 505208) +++ www/gitlab-pages/Makefile (working copy) @@ -10,7 +10,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITLAB= yes GL_ACCOUNT= gitlab-org Index: www/gitlab-workhorse/Makefile =================================================================== --- www/gitlab-workhorse/Makefile (revision 505208) +++ www/gitlab-workhorse/Makefile (working copy) @@ -11,11 +11,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go>=1.8.0:lang/go \ - git>=2.16.2:devel/git +BUILD_DEPENDS= git>=2.16.2:devel/git RUN_DEPENDS= p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool -USES= gmake +USES= gmake go:no_targets USE_GITLAB= yes GL_ACCOUNT= gitlab-org Index: www/go-appengine-sdk/Makefile =================================================================== --- www/go-appengine-sdk/Makefile (revision 505208) +++ www/go-appengine-sdk/Makefile (working copy) @@ -17,12 +17,11 @@ ONLY_FOR_ARCHS= amd64 i386 -BUILD_DEPENDS= go:lang/go RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR} -USES= gettext python:2.7 shebangfix zip +USES= gettext go python:2.7 shebangfix zip SHEBANG_GLOB= *.py *.bash *.sh *.pl *.cgi goapp WRKSRC= ${WRKDIR}/go_appengine Index: www/gobuffalo/Makefile =================================================================== --- www/gobuffalo/Makefile (revision 505208) +++ www/gobuffalo/Makefile (working copy) @@ -11,10 +11,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= go:lang/go \ - git:devel/git +RUN_DEPENDS= git:devel/git -USES= go:modules +USES= go:modules,run GO_PKGNAME= github.com/gobuffalo/buffalo GO_TARGET= ./buffalo Index: www/grafana2/Makefile =================================================================== --- www/grafana2/Makefile (revision 505208) +++ www/grafana2/Makefile (working copy) @@ -14,13 +14,11 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go - ONLY_FOR_ARCHS= i386 amd64 USE_RC_SUBR= grafana2 -USES= compiler +USES= compiler go USE_GITHUB= yes GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} Index: www/grafana3/Makefile =================================================================== --- www/grafana3/Makefile (revision 505208) +++ www/grafana3/Makefile (working copy) @@ -12,8 +12,6 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go - RUN_DEPENDS= ${LOCALBASE}/bin/phantomjs:lang/phantomjs \ webfonts>=0:x11-fonts/webfonts @@ -21,7 +19,7 @@ USE_RC_SUBR= grafana3 -USES= compiler +USES= compiler go USE_GITHUB= yes Index: www/grafana4/Makefile =================================================================== --- www/grafana4/Makefile (revision 505208) +++ www/grafana4/Makefile (working copy) @@ -14,13 +14,11 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go - ONLY_FOR_ARCHS= i386 amd64 USE_RC_SUBR= grafana -USES= compiler +USES= compiler go USE_GITHUB= yes GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} Index: www/grafana5/Makefile =================================================================== --- www/grafana5/Makefile (revision 505208) +++ www/grafana5/Makefile (working copy) @@ -17,9 +17,7 @@ ONLY_FOR_ARCHS= amd64 i386 -BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go - -USES= compiler +USES= compiler go USE_RC_SUBR= grafana USE_GITHUB= yes Index: www/kurly/Makefile =================================================================== --- www/kurly/Makefile (revision 505208) +++ www/kurly/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC_kurly}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITLAB= nodefault GL_TUPLE= davidjpeacock:kurly:369c1998dfbfca7043f8c995c8ef8714496530ea:kurly/src/gitlab.com/davidjpeacock/kurly Index: www/mattermost-server/Makefile =================================================================== --- www/mattermost-server/Makefile (revision 505208) +++ www/mattermost-server/Makefile (working copy) @@ -13,10 +13,11 @@ ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 -BUILD_DEPENDS= go>=1.8.1:lang/go RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \ mattermost-webapp>=${PORTVERSION}:www/mattermost-webapp +USES= go + GO_LDFLAGS= -X github.com/mattermost/mattermost-server/model.BuildNumber=${PORTVERSION} USE_RC_SUBR= mattermostd Index: www/minio/Makefile =================================================================== --- www/minio/Makefile (revision 505208) +++ www/minio/Makefile (working copy) @@ -9,10 +9,8 @@ LICENSE= APACHE20 -BUILD_DEPENDS= go>=1.9.4:lang/go +USES= compiler go -USES= compiler - USE_GITHUB= yes GHTAG= RELEASE.2019-06-15T23-07-18Z COMMIT_ID= 99bf4d0c429f04dbd013ba98840d07b759ae1702 Index: www/minio-client/Makefile =================================================================== --- www/minio-client/Makefile (revision 505208) +++ www/minio-client/Makefile (working copy) @@ -9,9 +9,10 @@ LICENSE= APACHE20 -BUILD_DEPENDS= go>=1.9.4:lang/go \ - bash:shells/bash +BUILD_DEPENDS= bash:shells/bash +USES= go + OPTIONS_DEFINE= MC MC_DESC= Install as mc Index: www/s/Makefile =================================================================== --- www/s/Makefile (revision 505208) +++ www/s/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= zquestz Index: www/uchiwa/Makefile =================================================================== --- www/uchiwa/Makefile (revision 505208) +++ www/uchiwa/Makefile (working copy) @@ -10,7 +10,7 @@ LICENSE= MIT -BUILD_DEPENDS= go>=1.6.0:lang/go +USES= go UCHIWA_LOGDIR= /var/log/uchiwa UCHIWA_CONFDIR= ${PREFIX}/etc/uchiwa Index: www/ytdl/Makefile =================================================================== --- www/ytdl/Makefile (revision 505208) +++ www/ytdl/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +USES= go USE_GITHUB= yes GH_ACCOUNT= rylio Index: x11/aminal/Makefile =================================================================== --- x11/aminal/Makefile (revision 505208) +++ x11/aminal/Makefile (working copy) @@ -11,9 +11,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/LICENSE -BUILD_DEPENDS= go:lang/go - -USES= gl +USES= gl go USE_GITHUB= nodefault # the main code is in GH_TUPLE GH_ACCOUNT= liamg GH_TUPLE= liamg:aminal:${DISTVERSIONFULL}:main/src/github.com/liamg/aminal \