mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

*/*: Repair after switching to versioned Go ports

Browse source 
- Add 1.17 to USES=go for ports that still need go117, remove GO_PORT;
- Add missing ${SETENV} ${MAKE_ENV} to repair BINARY_ALIAS;
- Remove explicit dependencies on lang/go.

PR:		264336
Reviewed by:	ygy jwb yuri mikael drtr0jan@yandex.ru decke mat
Differential Revision:	https://reviews.freebsd.org/D35346
This commit is contained in:
Dmitri Goutnik 2022-05-29 16:54:42 -05:00
parent 3012ca2179
commit b16eb860cc
16 changed files with 23 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
biology/ncbi-entrez-direct/Makefile
View file

@ -75,7 +75,7 @@ pre-configure:
do-build:
@${CP} ${FILESDIR}/modules.txt ${WRKSRC}/cmd/vendor
@${CP} -R ${WRKSRC}/eutils ${WRKSRC}/cmd/vendor
@cd ${WRKSRC}/cmd && ${FILESDIR}/build-cmd
@cd ${WRKSRC}/cmd && ${SETENV} ${MAKE_ENV} ${FILESDIR}/build-cmd
do-install:
cd ${WRKSRC} && ${INSTALL_SCRIPT} ${SCRIPTS} ${STAGEDIR}${PREFIX}/bin

2
devel/gocheese/Makefile
View file

@ -18,7 +18,7 @@ PLIST_FILES= ${DOCSDIR}/README \
bin/pyshop2packages.sh
do-build:
@cd ${WRKSRC} ; ${ENV} GOPATH=${WRKSRC} GO111MODULE=off go build -ldflags="-s -w" -o gocheese go.cypherpunks.ru/gocheese/v2
@cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} GO111MODULE=off ${GO_CMD} build -ldflags="-s -w" -o gocheese go.cypherpunks.ru/gocheese/v2
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/

3
devel/please/Makefile
View file

@ -11,8 +11,7 @@ COMMENT= High-performance extensible build system for reproducible builds
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go \
bash:shells/bash \
BUILD_DEPENDS= bash:shells/bash \
ca_root_nss>0:security/ca_root_nss \
git:devel/git \
protoc:devel/protobuf

2
net-im/gotosocial/Makefile
View file

@ -38,7 +38,7 @@ post-patch:
.endif
do-build:
@(cd ${WRKSRC} && ${SETENV} \
@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
VERSION=${DISTVERSION} COMMIT=${GH_TAGNAME} scripts/build.sh )
do-install:

6
net-im/nextcloud-spreed-signaling/Makefile
View file

@ -8,9 +8,7 @@ COMMENT= Signaling server used for Nextcloud Talk
LICENSE= AGPLv3
BUILD_DEPENDS= go:lang/go
USES= gmake
USES= gmake go:no_targets
USERS= signaling
GROUPS= signaling
@ -48,6 +46,6 @@ GH_TUPLE= coreos:go-semver:v0.2.0:coreos_go_semver/vendor/src/github.com/coreos/
uber-go:multierr:v1.1.0:uber_go_multierr/vendor/src/go.uber.org/multierr \
uber-go:zap:v1.10.0:uber_go_zap/vendor/src/go.uber.org/zap
MAKE_ENV= GO111MODULE="off"
MAKE_ENV= ${GO_ENV}
.include <bsd.port.mk>

2
net-mgmt/chronograf/Makefile
View file

@ -91,6 +91,6 @@ pre-build:
npm_config_tarball=${DISTDIR}/${DIST_SUBDIR}/node-v${NODEJS_VERSION}-headers.tar.gz \
yarn --frozen-lockfile --offline --no-progress --no-emoji
cd ${WRKSRC}/ui && ${SETENV} ${YARN_ENV} yarn run build
cd ${WRKSRC} && ${GMAKE} .bindata
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} .bindata
.include <bsd.port.post.mk>

2
net/ooni-probe-cli/Makefile
View file

@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss
USES= go:modules
USES= go:1.17,modules
USE_GITHUB= yes
USE_GITLAB= nodefault

5
security/crowdsec-firewall-bouncer/Makefile
View file

@ -9,10 +9,9 @@ COMMENT= CrowdSec bouncer written in golang for firewalls
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= git:devel/git@lite \
go:lang/go
BUILD_DEPENDS= git:devel/git@lite
USES= gmake
USES= gmake go:no_targets
USE_GITHUB= yes
GH_ACCOUNT= crowdsecurity

3
security/crowdsec/Makefile
View file

@ -10,10 +10,9 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= git:devel/git@lite \
go:lang/go \
jq:textproc/jq
USES= gmake
USES= gmake go:no_targets
USE_GITHUB= yes
GH_ACCOUNT= crowdsecurity

2
sysutils/chezmoi/Makefile
View file

@ -148,7 +148,7 @@ SOURCE_DATE_EPOCH_CMD= date -ur $$(grep TIMESTAMP ${DISTINFO_FILE} | ${SED} -e '
do-build-DOCS-on:
@${CP} ${_DISTDIR}/mermaid@8.8.0/dist/mermaid.min.js ${WRKSRC}/assets/chezmoi.io
(cd ${WRKSRC}/assets/chezmoi.io && mkdocs build)
(cd ${WRKSRC}/assets/chezmoi.io && ${SETENV} ${MAKE_ENV} mkdocs build)
post-extract:
@${MKDIR} ${WRKSRC}/vendor/github.com/chris-ramon

5
sysutils/containerd/Makefile
View file

@ -9,10 +9,9 @@ COMMENT= Open and reliable container runtime
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= bash:shells/bash \
go:lang/go
BUILD_DEPENDS= bash:shells/bash
USES= cpe gmake
USES= cpe gmake go:modules,no_targets
USE_GITHUB= yes
GH_SUBDIR= src/github.com/containerd/containerd

10
sysutils/datadog-agent/Makefile
View file

@ -359,20 +359,20 @@ pre-build:
${MAKE_CMD} -C .)
# Generate go source from templates
${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} GO111MODULE=off GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/pkg/status/render.go
${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} GO111MODULE=off GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/cmd/agent/gui/gui.go
${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} GO111MODULE=off GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/pkg/status/render.go
${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} GO111MODULE=off GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/cmd/agent/gui/gui.go
post-build:
# Generate config files
${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go agent-py3 \
${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go agent-py3 \
${WRKSRC}/pkg/config/config_template.yaml \
${WRKSRC}/cmd/agent/dist/datadog.yaml
${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go system-probe \
${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go system-probe \
${WRKSRC}/pkg/config/config_template.yaml \
${WRKSRC}/cmd/agent/dist/system-probe.yaml
${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go dogstatsd \
${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go dogstatsd \
${WRKSRC}/pkg/config/config_template.yaml \
${WRKSRC}/cmd/agent/dist/dogstatsd.yaml

3
sysutils/ipfs-go/Makefile
View file

@ -15,12 +15,11 @@ LICENSE_COMB= dual
LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT
LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE
USES= cpe go:modules
USES= cpe go:1.17,modules
CPE_VENDOR= protocol
GO_TARGET= ./cmd/ipfs:ipfs-go
GO_PORT= lang/go117 # quic-go does not build on Go 1.18 yet
NO_WRKSUBDIR= yes

2
sysutils/ipget/Makefile
View file

@ -10,7 +10,7 @@ COMMENT= Retrieve files over IPFS and save them locally
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= go:modules
USES= go:1.17,modules
USE_GITHUB= yes
GH_ACCOUNT= ipfs

2
sysutils/minikube/Makefile
View file

@ -243,6 +243,6 @@ pre-build:
-o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... && \
${LOCALBASE}/bin/go-bindata -nomemcopy \
-o pkg/minikube/translate/translations.go -pkg translate translations/... && \
${LOCALBASE}/bin/gofmt -s -w pkg/minikube/translate/translations.go
${LOCALBASE}/bin/gofmt${GO_SUFFIX} -s -w pkg/minikube/translate/translations.go
.include <bsd.port.mk>

3
www/adguardhome/Makefile
View file

@ -10,10 +10,9 @@ COMMENT= Network-wide ads & trackers blocking DNS server
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USES= cpe go:modules
USES= cpe go:1.17,modules
GO_MODULE= github.com/AdguardTeam/AdGuardHome
GO_PORT= lang/go117 # quic-go does not build on Go 1.18 yet
# to rebuild the deps archives:
# 1. set DEV_UPDATE_MODE=yes