Date: Sun, 29 Sep 2019 22:34:31 +0000 (UTC) From: Dmitri Goutnik <dmgk@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513276 - in head: sysutils/amazon-ssm-agent sysutils/circonus-agent sysutils/consul-alerts sysutils/consul_exporter sysutils/container-diff sysutils/coreos-ct sysutils/envconsul sysuti... Message-ID: <201909292234.x8TMYVBX090802@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dmgk Date: Sun Sep 29 22:34:31 2019 New Revision: 513276 URL: https://svnweb.freebsd.org/changeset/ports/513276 Log: Go ports: cleanup, finish transition to USES=go started with r505321 (cat. sysutils-x11) - Remove custom build/install targets left in place after r505321 - Switch to the new GO_TARGET tuple syntax introduced in r512001 Reviewed by: tobik Approved by: araujo (mentor), portmgr (adamw) Differential Revision: https://reviews.freebsd.org/D21744 Added: head/x11/aminal/files/patch-vendor_github.com_riywo_loginshell_loginshell.go - copied, changed from r513275, head/x11/aminal/files/patch-src_github.com_liamg_aminal_vendor_github.com_riywo_loginshell_loginshell.go Deleted: head/x11/aminal/files/patch-src_github.com_liamg_aminal_vendor_github.com_riywo_loginshell_loginshell.go Modified: head/sysutils/amazon-ssm-agent/Makefile head/sysutils/circonus-agent/Makefile head/sysutils/consul-alerts/Makefile head/sysutils/consul_exporter/Makefile head/sysutils/container-diff/Makefile head/sysutils/coreos-ct/Makefile head/sysutils/envconsul/Makefile head/sysutils/epazote/Makefile head/sysutils/fusefs-webdavfs/Makefile head/sysutils/goawk/Makefile head/sysutils/gomplate/Makefile head/sysutils/goss/Makefile head/sysutils/hared/Makefile head/sysutils/helm/Makefile head/sysutils/immortal/Makefile head/sysutils/ipfs-go/Makefile head/sysutils/nomad/Makefile head/sysutils/paladin/Makefile head/sysutils/phpfpm_exporter/Makefile head/sysutils/rest-server/Makefile head/sysutils/snmp_exporter/Makefile head/sysutils/sockaddr/Makefile head/sysutils/zrepl/Makefile head/textproc/consul-template/Makefile head/textproc/gron/Makefile head/textproc/jid/Makefile head/textproc/minify/Makefile head/textproc/sift/Makefile head/textproc/spiff/Makefile head/www/caddy/Makefile head/www/fabio/Makefile head/www/gitea/Makefile head/www/gitlab-pages/Makefile head/www/go-www/Makefile head/www/grafana4/Makefile head/www/grafana5/Makefile head/www/kurly/Makefile head/www/miniflux/Makefile head/www/minio-client/Makefile head/www/s/Makefile head/www/uchiwa/Makefile head/www/varnish_exporter/Makefile head/www/webhook/Makefile head/www/ytdl/Makefile head/x11/aminal/Makefile Modified: head/sysutils/amazon-ssm-agent/Makefile ============================================================================== --- head/sysutils/amazon-ssm-agent/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/amazon-ssm-agent/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -18,6 +18,13 @@ USE_GITHUB= yes GH_ACCOUNT= aws GH_SUBDIR= src/github.com/aws/amazon-ssm-agent +GO_BUILDLAGS= -ldflags "-s -w" +GO_TARGET= ./agent:${PREFIX}/sbin/amazon-ssm-agent \ + ./agent/framework/processor/executer/outofproc/worker:${PREFIX}/sbin/ssm-document-worker \ + ./agent/framework/processor/executer/outofproc/sessionworker:${PREFIX}/sbin/ssm-session-worker \ + ./agent/session/logging:${PREFIX}/sbin/ssm-session-logger \ + ./agent/cli-main:${PREFIX}/sbin/ssm-cli + PLIST_FILES= etc/amazon/ssm/amazon-ssm-agent.json.template \ etc/amazon/ssm/seelog_unix.xml.template \ sbin/amazon-ssm-agent \ @@ -28,33 +35,10 @@ PLIST_FILES= etc/amazon/ssm/amazon-ssm-agent.json.temp USE_RC_SUBR= amazon-ssm-agent -do-build: - @cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0 \ - go build -ldflags "-s -w" -o amazon-ssm-agent -v \ - agent/agent.go agent/agent_unix.go agent/agent_parser.go - @cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0 \ - go build -ldflags "-s -w" -o ssm-document-worker -v \ - agent/framework/processor/executer/outofproc/worker/main.go - @cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0 \ - go build -ldflags "-s -w" -o ssm-session-worker -v \ - agent/framework/processor/executer/outofproc/sessionworker/main.go - @cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0 \ - go build -ldflags "-s -w" -o ssm-session-logger -v \ - agent/session/logging/main.go - @cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0 \ - go build -ldflags "-s -w" -o ssm-cli -v agent/cli-main/cli-main.go +post-patch: + ${LN} -s ${WRKSRC}/vendor/src/* ${WRKSRC}/vendor/ -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/amazon-ssm-agent ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/ssm-document-worker ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/ssm-session-worker ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/ssm-session-logger ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/ssm-cli ${STAGEDIR}${PREFIX}/sbin +post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/amazon/ssm ${INSTALL_DATA} ${WRKSRC}/amazon-ssm-agent.json.template ${STAGEDIR}${PREFIX}/etc/amazon/ssm ${INSTALL_DATA} ${WRKSRC}/seelog_unix.xml ${STAGEDIR}${PREFIX}/etc/amazon/ssm/seelog_unix.xml.template Modified: head/sysutils/circonus-agent/Makefile ============================================================================== --- head/sysutils/circonus-agent/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/circonus-agent/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -17,47 +17,43 @@ USE_GITHUB= yes GH_ACCOUNT= circonus-labs GH_SUBDIR= src/github.com/circonus-labs/circonus-agent -GH_TUPLE= alecthomas:units:2efee85:units/src/github.com/alecthomas/units \ - pkg:errors:645ef00:errors/src/github.com/pkg/errors \ - rs:zerolog:56a970de:zerolog/src/github.com/rs/zerolog \ - spf13:cobra:c439c4fa:cobra/src/github.com/spf13/cobra \ - spf13:viper:b5e8006c:viper/src/github.com/spf13/viper \ - golang:sys:7ceb54c8:sys/src/golang.org/x/sys \ - xi2:httpgzip:2d8bcdd:httpgzip/src/xi2.org/x/httpgzip \ - pelletier:go-toml:acdc4509:go_toml/src/github.com/pelletier/go-toml \ - maier:go-appstats:812a586:go_appstats/src/github.com/maier/go-appstats \ - circonus-labs:circonus-gometrics:b25d14e:circonus_gometrics/src/github.com/circonus-labs/circonus-gometrics \ - go-tomb:tomb:d5d1b58:tomb2/src/gopkg.in/tomb.v2 \ - go-yaml:yaml:7f97868e:yaml2/src/gopkg.in/yaml.v2 \ - go-ole:go-ole:a41e3c4:go_ole/src/github.com/go-ole/go-ole \ - circonus-labs:circonusllhist:1e65893c:circonusllhist/src/github.com/circonus-labs/circonusllhist \ - fsnotify:fsnotify:c2828203:fsnotify/src/github.com/fsnotify/fsnotify \ - hashicorp:go-retryablehttp:794af36:go_retryablehttp/src/github.com/hashicorp/go-retryablehttp \ - spf13:pflag:e57e3ee:pflag/src/github.com/spf13/pflag \ - hashicorp:go-cleanhttp:d5fe4b57:go_cleanhttp/src/github.com/hashicorp/go-cleanhttp \ - hashicorp:hcl:23c074d:hcl/src/github.com/hashicorp/hcl \ - magiconair:properties:c3beff4c:properties/src/github.com/magiconair/properties \ - mitchellh:mapstructure:00c29f56:mapstructure/src/github.com/mitchellh/mapstructure \ - spf13:afero:bb8f1927:afero/src/github.com/spf13/afero \ - spf13:cast:8965335b:cast/src/github.com/spf13/cast \ - spf13:jWalterWeatherman:7c0cea34:jWalterWeatherman/src/github.com/spf13/jwalterweatherman \ - golang:text:f21a4dfb:text/src/golang.org/x/text \ - tv42:httpunix:b75d861:httpunix/src/github.com/tv42/httpunix \ - prometheus:client_model:99fa1f4:client_model/src/github.com/prometheus/client_model \ - golang:protobuf:8ee7999:protobuf/src/github.com/golang/protobuf \ - prometheus:common:e4aa40a9:common/src/github.com/prometheus/common \ - matttproud:golang_protobuf_extensions:3247c845:golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions +GH_TUPLE= alecthomas:units:2efee85:units/vendor/github.com/alecthomas/units \ + pkg:errors:645ef00:errors/vendor/github.com/pkg/errors \ + rs:zerolog:56a970de:zerolog/vendor/github.com/rs/zerolog \ + spf13:cobra:c439c4fa:cobra/vendor/github.com/spf13/cobra \ + spf13:viper:b5e8006c:viper/vendor/github.com/spf13/viper \ + golang:sys:7ceb54c8:sys/vendor/golang.org/x/sys \ + xi2:httpgzip:2d8bcdd:httpgzip/vendor/xi2.org/x/httpgzip \ + pelletier:go-toml:acdc4509:go_toml/vendor/github.com/pelletier/go-toml \ + maier:go-appstats:812a586:go_appstats/vendor/github.com/maier/go-appstats \ + circonus-labs:circonus-gometrics:b25d14e:circonus_gometrics/vendor/github.com/circonus-labs/circonus-gometrics \ + go-tomb:tomb:d5d1b58:tomb2/vendor/gopkg.in/tomb.v2 \ + go-yaml:yaml:7f97868e:yaml2/vendor/gopkg.in/yaml.v2 \ + go-ole:go-ole:a41e3c4:go_ole/vendor/github.com/go-ole/go-ole \ + circonus-labs:circonusllhist:1e65893c:circonusllhist/vendor/github.com/circonus-labs/circonusllhist \ + fsnotify:fsnotify:c2828203:fsnotify/vendor/github.com/fsnotify/fsnotify \ + hashicorp:go-retryablehttp:794af36:go_retryablehttp/vendor/github.com/hashicorp/go-retryablehttp \ + spf13:pflag:e57e3ee:pflag/vendor/github.com/spf13/pflag \ + hashicorp:go-cleanhttp:d5fe4b57:go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \ + hashicorp:hcl:23c074d:hcl/vendor/github.com/hashicorp/hcl \ + magiconair:properties:c3beff4c:properties/vendor/github.com/magiconair/properties \ + mitchellh:mapstructure:00c29f56:mapstructure/vendor/github.com/mitchellh/mapstructure \ + spf13:afero:bb8f1927:afero/vendor/github.com/spf13/afero \ + spf13:cast:8965335b:cast/vendor/github.com/spf13/cast \ + spf13:jWalterWeatherman:7c0cea34:jWalterWeatherman/vendor/github.com/spf13/jwalterweatherman \ + golang:text:f21a4dfb:text/vendor/golang.org/x/text \ + tv42:httpunix:b75d861:httpunix/vendor/github.com/tv42/httpunix \ + prometheus:client_model:99fa1f4:client_model/vendor/github.com/prometheus/client_model \ + golang:protobuf:8ee7999:protobuf/vendor/github.com/golang/protobuf \ + prometheus:common:e4aa40a9:common/vendor/github.com/prometheus/common \ + matttproud:golang_protobuf_extensions:3247c845:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions +GO_TARGET= :circonus-agentd + ETCDIR= ${PREFIX}/etc/circonus-agentd PLIST_FILES= bin/circonus-agentd "@dir ${ETCDIR}" -do-build: - ( cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} \ - go build ${BUILD_FLAGS} -o bin/circonus-agentd ) - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/circonus-agentd ${STAGEDIR}${PREFIX}/bin/circonus-agentd +post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} .include <bsd.port.mk> Modified: head/sysutils/consul-alerts/Makefile ============================================================================== --- head/sysutils/consul-alerts/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/consul-alerts/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -10,32 +10,19 @@ COMMENT= Simple daemon to send notifications based on LICENSE= GPLv2+ -USES= compiler go +USES= go USE_GITHUB= yes GH_ACCOUNT= AcalephStorage GH_SUBDIR= src/github.com/AcalephStorage/consul-alerts -GH_TUPLE= aws:aws-sdk-go:v1.8.30:aws_sdk_go/src/github.com/aws/aws-sdk-go \ - imdario:mergo:0.2.2:mergo/src/github.com/imdario/mergo \ - mitchellh:hashstructure:9204ce5:hashstructure/src/github.com/mitchellh/hashstructure +GH_TUPLE= aws:aws-sdk-go:v1.8.30:aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ + imdario:mergo:0.2.2:mergo/vendor/github.com/imdario/mergo \ + mitchellh:hashstructure:9204ce5:hashstructure/vendor/github.com/mitchellh/hashstructure +GO_BUILDFLAGS= -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" + PLIST_FILES= ${PREFIX}/bin/${PORTNAME} USE_RC_SUBR= ${PORTNAME} -do-build: - cd ${GO_WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \ - -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/${PORTNAME} - -do-install: - ${INSTALL_PROGRAM} ${GO_WRKSRC}/bin/${PORTNAME} \ - ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - -.include <bsd.port.pre.mk> - -.if ${COMPILER_TYPE} == clang -BUILD_ENV= CC=clang -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/sysutils/consul_exporter/Makefile ============================================================================== --- head/sysutils/consul_exporter/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/consul_exporter/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -10,37 +10,19 @@ COMMENT= Exporter for Consul metrics LICENSE= APACHE20 -USES= compiler go +USES= go USE_GITHUB= yes GH_ACCOUNT= prometheus GH_SUBDIR= src/github.com/${GH_ACCOUNT}/consul_exporter -USE_RC_SUBR= consul_exporter - -PLIST_FILES= bin/consul_exporter - -post-extract: - @${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/ - -do-build: - @cd ${WRKSRC}/src/github.com/prometheus/consul_exporter; ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 ${BUILD_ENV} GOPATH=${WRKSRC} go build \ - -ldflags "\ +GO_BUILDFLAGS= -ldflags "\ -X github.com/prometheus/consul_exporter/version.Version=${PORTVERSION} \ -X github.com/prometheus/consul_exporter/version.VersionPrerelease= \ - -X github.com/prometheus/consul_exporter/version.GitDescribe=v${PORTVERSION} \ - " \ - -o bin/consul_exporter + -X github.com/prometheus/consul_exporter/version.GitDescribe=v${PORTVERSION}" -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/prometheus/consul_exporter/bin/consul_exporter ${STAGEDIR}${PREFIX}/bin/consul_exporter +USE_RC_SUBR= consul_exporter -.include <bsd.port.pre.mk> +PLIST_FILES= bin/consul_exporter -# golang assumes that if clang is in use, it is called "clang" and not "cc". If -# it's called "cc", go fails. -.if ${COMPILER_TYPE} == clang -BUILD_ENV= CC=clang -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/sysutils/container-diff/Makefile ============================================================================== --- head/sysutils/container-diff/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/container-diff/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -21,7 +21,4 @@ PLIST_FILES= bin/container-diff GH_ACCOUNT= GoogleContainerTools USE_GITHUB= yes -do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/bin/container-diff ${STAGEDIR}${PREFIX}/bin/container-diff - .include <bsd.port.mk> Modified: head/sysutils/coreos-ct/Makefile ============================================================================== --- head/sysutils/coreos-ct/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/coreos-ct/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -18,17 +18,12 @@ GH_ACCOUNT= coreos GH_PROJECT= container-linux-config-transpiler GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} -GO_LDFLAGS= -w -X github.com/${GH_ACCOUNT}/${GH_PROJECT}/internal/version.Raw=${PORTVERSION} +GO_BUILDFLAGS= -ldflags "-w -X github.com/${GH_ACCOUNT}/${GH_PROJECT}/internal/version.Raw=${PORTVERSION}" +GO_TARGET= ./internal:ct OPTIONS_DEFINE= DOCS PORTDOCS= README.md NEWS doc/* - -do-build: - @(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build -o ${WRKDIR}/bin/ct -ldflags "${GO_LDFLAGS}" ./internal) - -do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/bin/ct ${STAGEDIR}${PREFIX}/bin post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/sysutils/envconsul/Makefile ============================================================================== --- head/sysutils/envconsul/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/envconsul/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -23,19 +23,10 @@ OPTIONS_DEFINE= DOCS PORTDOCS= README.md COMMIT= 7ece735 -GO_LDFLAGS= -ldflags="-s -w \ +GO_BUILDFLAGS= -ldflags="-s -w \ -X main.Name=${PORTNAME} \ -X main.Version=${PORTVERSION} \ -X main.GitCommit=${COMMIT}" - -do-build: - @cd ${WRKSRC}/src/github.com/hashicorp/envconsul; \ - ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} \ - go build ${GO_LDFLAGS}\ - -o bin/envconsul - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/envconsul/bin/envconsul ${STAGEDIR}${PREFIX}/bin/envconsul post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/sysutils/epazote/Makefile ============================================================================== --- head/sysutils/epazote/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/epazote/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -10,21 +10,16 @@ COMMENT= Automated HTTP (microservices) supervisor LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= compiler go +USES= go 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 +GH_TUPLE= epazote:scheduler:0.1.0:scheduler/vendor/github.com/epazote/scheduler \ + go-yaml:yaml:cd8b52f:yaml/vendor/github.com/go-yaml/yaml GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} -PLIST_FILES= bin/epazote +GO_BUILDFLAGS= -ldflags "-X main.version=${PORTVERSION}" +GO_TARGET= ./cmd/epazote -do-build: - @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ - ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ - "-X main.version=${PORTVERSION}" -o epazote cmd/epazote/main.go; - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/epazote ${STAGEDIR}${PREFIX}/bin/epazote +PLIST_FILES= bin/epazote .include <bsd.port.mk> Modified: head/sysutils/fusefs-webdavfs/Makefile ============================================================================== --- head/sysutils/fusefs-webdavfs/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/fusefs-webdavfs/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -41,6 +41,8 @@ GH_ACCOUNT+= ${GETOPT_GH_ACCOUNT}:getopt ${FUSE_GH_ACC GH_PROJECT+= ${GETOPT_GH_PROJECT}:getopt ${FUSE_GH_PROJECT}:fuse GH_TAGNAME+= ${GETOPT_GH_TAGNAME}:getopt ${FUSE_GH_TAGNAME}:fuse +GO_TARGET= :${PREFIX}/sbin/mount.webdavfs + PLIST_FILES= sbin/mount.webdavfs sbin/mount_webdavfs SUB_FILES= pkg-message mount_webdavfs @@ -53,8 +55,7 @@ post-patch: ${LN} -s ${WRKDIR}/getopt-${GETOPT_GH_TAGNAME}/v2 ${GETOPT_WRKSRCDIR} ${LN} -s ${WRKDIR}/fuse-${FUSE_GH_TAGNAME} ${FUSE_WRKSRCDIR}/fuse -do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin/mount.webdavfs +post-install: ${INSTALL_SCRIPT} ${WRKDIR}/mount_webdavfs ${STAGEDIR}${PREFIX}/sbin .include <bsd.port.mk> Modified: head/sysutils/goawk/Makefile ============================================================================== --- head/sysutils/goawk/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/goawk/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -9,22 +9,14 @@ MAINTAINER= yuri@FreeBSD.org COMMENT= AWK interpreter written in Go LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/LICENSE.txt +LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= go -USE_GITHUB= nodefault # the main code is in GH_TUPLE +USE_GITHUB= yes GH_ACCOUNT= benhoyt -GH_TUPLE= benhoyt:goawk:${DISTVERSIONFULL}:main/src/github.com/benhoyt/goawk GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} PLIST_FILES= bin/${PORTNAME} - -do-build: - @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} && \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install ./... - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/sysutils/gomplate/Makefile ============================================================================== --- head/sysutils/gomplate/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/gomplate/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -18,19 +18,12 @@ GH_ACCOUNT= hairyhenderson GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} GH_TAG_COMMIT= ce4b3e3 -PLIST_FILES= bin/gomplate +GO_BUILDFLAGS= -ldflags "\ + -w -s \ + -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitCommit=${GH_TAG_COMMIT} \ + -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.Version=${DISTVERSION}" +GO_TARGET= ./cmd/gomplate -post-extract: - @${CP} -RpP ${WRKSRC}/vendor/* ${WRKSRC}/src/ - -do-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ - ${LOCALBASE}/bin/go build \ - -ldflags "-w -s -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitCommit=${GH_TAG_COMMIT} -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.Version=${DISTVERSION}" \ - -o ${PORTNAME} \ - ./cmd/gomplate - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +PLIST_FILES= bin/gomplate .include <bsd.port.mk> Modified: head/sysutils/goss/Makefile ============================================================================== --- head/sysutils/goss/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/goss/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -22,34 +22,30 @@ USE_RC_SUBR= goss USE_GITHUB= yes GH_ACCOUNT= aelsabbahy GH_SUBDIR= src/github.com/aelsabbahy/${PORTNAME} -GH_TUPLE= achanda:go-sysctl:6be7678:achanda/src/github.com/achanda/go-sysctl \ - aelsabbahy:go-ps:4433868:gops/src/github.com/aelsabbahy/go-ps \ - aelsabbahy:GOnetstat:edf89f7:GOnetstat/src/github.com/aelsabbahy/GOnetstat \ - cheekybits:genny:e8e29e6:cheekybits/src/github.com/cheekybits/genny \ - fatih:color:bf82308:fatih/src/github.com/fatih/color \ - go-yaml:yaml:a5b47d3:yaml/src/gopkg.in/yaml.v2 \ - golang:sys:9a2e24c:sys/src/golang.org/x/sys \ - mattn:go-colorable:d228849:mattn/src/github.com/mattn/go-colorable \ - mattn:go-isatty:66b8e73:mattnisatty/src/github.com/mattn/go-isatty \ - miekg:dns:58f52c5:miekg/src/github.com/miekg/dns \ - moby:moby:383a2f0:docker/src/github.com/docker/docker \ - oleiade:reflections:0e86b3c:oleiade/src/github.com/oleiade/reflections \ - onsi:gomega:ff4bc6b:onsi/src/github.com/onsi/gomega \ - opencontainers:runc:8779fa5:opencontainers/src/github.com/opencontainers/runc \ - patrickmn:go-cache:1881a9b:patrickmn/src/github.com/patrickmn/go-cache \ - urfave:cli:d86a009:urfave/src/github.com/urfave/cli +GH_TUPLE= achanda:go-sysctl:6be7678:achanda/vendor/github.com/achanda/go-sysctl \ + aelsabbahy:go-ps:4433868:gops/vendor/github.com/aelsabbahy/go-ps \ + aelsabbahy:GOnetstat:edf89f7:GOnetstat/vendor/github.com/aelsabbahy/GOnetstat \ + cheekybits:genny:e8e29e6:cheekybits/vendor/github.com/cheekybits/genny \ + fatih:color:bf82308:fatih/vendor/github.com/fatih/color \ + go-yaml:yaml:a5b47d3:yaml/vendor/gopkg.in/yaml.v2 \ + golang:sys:9a2e24c:sys/vendor/golang.org/x/sys \ + mattn:go-colorable:d228849:mattn/vendor/github.com/mattn/go-colorable \ + mattn:go-isatty:66b8e73:mattnisatty/vendor/github.com/mattn/go-isatty \ + miekg:dns:58f52c5:miekg/vendor/github.com/miekg/dns \ + moby:moby:383a2f0:docker/vendor/github.com/docker/docker \ + oleiade:reflections:0e86b3c:oleiade/vendor/github.com/oleiade/reflections \ + onsi:gomega:ff4bc6b:onsi/vendor/github.com/onsi/gomega \ + opencontainers:runc:8779fa5:opencontainers/vendor/github.com/opencontainers/runc \ + patrickmn:go-cache:1881a9b:patrickmn/vendor/github.com/patrickmn/go-cache \ + urfave:cli:d86a009:urfave/vendor/github.com/urfave/cli +GO_BUILDFLAGS= -ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -s -w" +GO_TARGET= ./cmd/${PORTNAME} + post-patch: ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/extras/goss.yaml.sample -do-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ - go build -ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -s -w" -o \ - bin/${PORTNAME} ./cmd/${PORTNAME} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/bin/${PORTNAME} \ - ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +post-install: ${INSTALL_DATA} ${WRKSRC}/extras/goss.yaml.sample ${STAGEDIR}${PREFIX}/etc/goss.yaml.sample ${MKDIR} ${STAGEDIR}${PREFIX}/etc/goss.d ${INSTALL_DATA} ${WRKSRC}/extras/process_goss.yaml.sample \ Modified: head/sysutils/hared/Makefile ============================================================================== --- head/sysutils/hared/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/hared/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -16,25 +16,21 @@ USE_GITHUB= yes GH_ACCOUNT= jpmens GH_PROJECT= hared-hare -GH_TUPLE= go-gcfg:gcfg:f02745a:gcfg/src/gopkg.in/gcfg.v1 \ - go-warnings:warnings:27b9fab:warnings/src/gopkg.in/warnings.v0 \ - eclipse:paho.mqtt.golang:d4f545e:paho/src/github.com/eclipse/paho.mqtt.golang \ - golang:net:9dfe398:net/src/golang.org/x/net \ - gorilla:websocket:7a8dacf:websocket/src/github.com/gorilla/websocket +GH_TUPLE= go-gcfg:gcfg:f02745a:gcfg/vendor/gopkg.in/gcfg.v1 \ + go-warnings:warnings:27b9fab:warnings/vendor/gopkg.in/warnings.v0 \ + eclipse:paho.mqtt.golang:d4f545e:paho/vendor/github.com/eclipse/paho.mqtt.golang \ + golang:net:9dfe398:net/vendor/golang.org/x/net \ + gorilla:websocket:7a8dacf:websocket/vendor/github.com/gorilla/websocket +GO_TARGET= ./daemon:${PORTNAME} + CONFLICTS_INSTALL= sysutils/py-hared OPTIONS_DEFINE= DOCS ETCDIR= ${PREFIX}/etc -do-build: - (cd ${GO_WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ - ${GO_CMD} build -o ${GO_PKGNAME} ./daemon/hared.go) - -do-install: - ${INSTALL_PROGRAM} ${GO_WRKSRC}/${GO_PKGNAME} ${STAGEDIR}${PREFIX}/bin +post-install: ${INSTALL_DATA} ${WRKSRC}/daemon/hared.ini.sample ${STAGEDIR}${ETCDIR} post-install-DOCS-on: Modified: head/sysutils/helm/Makefile ============================================================================== --- head/sysutils/helm/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/helm/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -15,29 +15,15 @@ RUN_DEPENDS= kubectl:sysutils/kubectl USES= go tar:xz -PLIST_FILES= bin/${PORTNAME} \ - bin/tiller \ - bin/rudder - -post-patch: - ${MV} ${WRKSRC}/vendor/* ${WRKDIR}/src/ - ${LN} -s ${WRKSRC} ${WRKDIR}/src/k8s.io/helm - -do-build: -.for cmd in helm tiller rudder - cd ${WRKDIR}/src/k8s.io/helm/cmd/${cmd} ; \ - GOPATH=${WRKDIR} GOCACHE=${WRKDIR}/.gocache go build \ - -ldflags="-X k8s.io/helm/pkg/version.Version=v${PORTVERSION} \ +GO_PKGNAME= k8s.io/helm +GO_BUILDFLAGS= -ldflags="-X k8s.io/helm/pkg/version.Version=v${PORTVERSION} \ -X k8s.io/helm/pkg/version.GitCommit=5270352a09c7e8b6e8c9593002a73535276507c0 \ -X k8s.io/helm/pkg/version.BuildMetadata=" -.endfor +GO_TARGET= ./cmd/${PORTNAME} \ + ./cmd/tiller \ + ./cmd/rudder -do-install: -.for cmd in helm tiller rudder - ${INSTALL_PROGRAM} \ - ${WRKSRC}/cmd/${cmd}/${cmd} \ - ${STAGEDIR}${PREFIX}/bin/${cmd} -.endfor +PLIST_FILES= ${GO_TARGET:C/.\/cmd/bin/} maintainer-distfile: (cd /tmp; fetch https://github.com/helm/helm/archive/v${PORTVERSION}.tar.gz; \ Modified: head/sysutils/immortal/Makefile ============================================================================== --- head/sysutils/immortal/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/immortal/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -13,34 +13,23 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= go USE_RC_SUBR= immortaldir USE_GITHUB= yes -GH_TUPLE= immortal:logrotate:6f52ae7:logrotate/src/github.com/immortal/logrotate \ - immortal:multiwriter:2e0dd11:multiwriter/src/github.com/immortal/multiwriter \ - immortal:natcasesort:162328b:natcasesort/src/github.com/immortal/natcasesort \ - immortal:xtime:fb1aca1:xtime/src/github.com/immortal/xtime \ - nbari:violetear:5c7cdfe:nbari/src/github.com/nbari/violetear \ - go-yaml:yaml:51d6538:yaml/src/github.com/go-yaml/yaml +GH_TUPLE= immortal:logrotate:6f52ae7:logrotate/vendor/github.com/immortal/logrotate \ + immortal:multiwriter:2e0dd11:multiwriter/vendor/github.com/immortal/multiwriter \ + immortal:natcasesort:162328b:natcasesort/vendor/github.com/immortal/natcasesort \ + immortal:xtime:fb1aca1:xtime/vendor/github.com/immortal/xtime \ + nbari:violetear:5c7cdfe:nbari/vendor/github.com/nbari/violetear \ + go-yaml:yaml:51d6538:yaml/vendor/github.com/go-yaml/yaml GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} +GO_BUILDFLAGS= -ldflags "-s -w -X main.version=${PORTVERSION}" +GO_TARGET= ./cmd/immortal \ + ./cmd/immortalctl \ + ./cmd/immortaldir + OPTIONS_DEFINE= EXAMPLES -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 immortal cmd/immortal/main.go; - @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 immortalctl cmd/immortalctl/main.go; - @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 immortaldir cmd/immortaldir/main.go; - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/immortal/immortal/immortal ${STAGEDIR}${PREFIX}/bin/immortal - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/immortal/immortal/immortalctl ${STAGEDIR}${PREFIX}/bin/immortalctl - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/immortal/immortal/immortaldir ${STAGEDIR}${PREFIX}/bin/immortaldir - ${INSTALL_MAN} ${WRKSRC}/src/github.com/immortal/immortal/man/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/ - post-install: + ${INSTALL_MAN} ${WRKSRC}/src/github.com/immortal/immortal/man/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/ @${MKDIR} ${STAGEDIR}${ETCDIR} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${FILESDIR}/www.yml ${STAGEDIR}${EXAMPLESDIR}/www.yml.sample Modified: head/sysutils/ipfs-go/Makefile ============================================================================== --- head/sysutils/ipfs-go/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/ipfs-go/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -20,7 +20,7 @@ ONLY_FOR_ARCHS= amd64 i386 USES= go:modules -GO_TARGET= ./cmd/ipfs +GO_TARGET= ./cmd/ipfs:ipfs-go NO_WRKSUBDIR= yes @@ -52,8 +52,7 @@ post-patch: @${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/format_go1_12.go @${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/frame_go1_12.go -do-install: +post-install: @${MKDIR} ${STAGEDIR}${IPFS_HOME} - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/ipfs ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} .include <bsd.port.mk> Modified: head/sysutils/nomad/Makefile ============================================================================== --- head/sysutils/nomad/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/nomad/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -14,32 +14,21 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= On i386: go compiler crashes: https://github.com/golang/go/issues/23763 -USES= compiler go +USES= go USE_GITHUB= yes GH_ACCOUNT= hashicorp GH_SUBDIR= src/github.com/hashicorp/nomad USE_RC_SUBR= nomad +GO_BUILDFLAGS= -tags ui \ + -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" + USERS= nomad GROUPS= nomad -do-build: - @cd ${WRKSRC}/src/github.com/hashicorp/nomad && \ - ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x -tags ui \ - -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/nomad - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/nomad/bin/nomad ${STAGEDIR}${PREFIX}/bin/nomad +post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/nomad - ${INSTALL_DATA} ${WRKSRC}/src/github.com/hashicorp/nomad/dist/client.hcl \ - ${STAGEDIR}${PREFIX}/etc/nomad/client.hcl.sample - ${INSTALL_DATA} ${WRKSRC}/src/github.com/hashicorp/nomad/dist/server.hcl \ - ${STAGEDIR}${PREFIX}/etc/nomad/server.hcl.sample + ${INSTALL_DATA} ${WRKSRC}/dist/client.hcl ${STAGEDIR}${PREFIX}/etc/nomad/client.hcl.sample + ${INSTALL_DATA} ${WRKSRC}/dist/server.hcl ${STAGEDIR}${PREFIX}/etc/nomad/server.hcl.sample -.include <bsd.port.pre.mk> - -.if ${COMPILER_TYPE} == clang -BUILD_ENV= CC=clang -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/sysutils/paladin/Makefile ============================================================================== --- head/sysutils/paladin/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/paladin/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -12,14 +12,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= go GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} +GO_BUILDFLAGS= -ldflags="-X main.localbase=/usr/local" USE_GITHUB= yes GH_ACCOUNT= rwestlund - -# Override default build command to pass ldflags. -do-build: - @(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install \ - -ldflags="-X main.localbase=/usr/local" -v ${GO_TARGET}) post-install: @${CP} ${WRKSRC}/etc/paladin.conf.sample ${STAGEDIR}/${LOCALBASE}/etc/ Modified: head/sysutils/phpfpm_exporter/Makefile ============================================================================== --- head/sysutils/phpfpm_exporter/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/phpfpm_exporter/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -17,13 +17,9 @@ GH_ACCOUNT= bakins GH_PROJECT= php-fpm-exporter GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} +GO_TARGET= ./cmd/${GH_PROJECT}:${PORTNAME} + PLIST_FILES= bin/${PORTNAME} USE_RC_SUBR= phpfpm_exporter - -do-build: - @(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 ${GO_CMD} build -o ${PORTNAME} ./cmd/${GH_PROJECT}) - -do-install: - ${INSTALL_PROGRAM} ${GO_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include <bsd.port.mk> Modified: head/sysutils/rest-server/Makefile ============================================================================== --- head/sysutils/rest-server/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/rest-server/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -25,7 +25,4 @@ GROUPS= restserver PLIST_FILES= bin/${PORTNAME} -do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - .include <bsd.port.mk> Modified: head/sysutils/snmp_exporter/Makefile ============================================================================== --- head/sysutils/snmp_exporter/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/snmp_exporter/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -18,7 +18,8 @@ USE_RC_SUBR= snmp_exporter GH_ACCOUNT= prometheus -GO_TARGET= . ./generator +GO_TARGET= . \ + ./generator:snmp_exporter_generator post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${GO_WRKSRC}/generator/main.go @@ -26,6 +27,5 @@ post-patch: post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/snmp_exporter/ ${INSTALL_DATA} ${FILESDIR}/generator.yml ${STAGEDIR}${PREFIX}/etc/snmp_exporter/generator.yml - ${MV} ${STAGEDIR}${PREFIX}/bin/generator ${STAGEDIR}${PREFIX}/bin/snmp_exporter_generator .include <bsd.port.mk> Modified: head/sysutils/sockaddr/Makefile ============================================================================== --- head/sysutils/sockaddr/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/sockaddr/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -18,19 +18,12 @@ GH_ACCOUNT= hashicorp GH_PROJECT= go-sockaddr GH_TAGNAME= 7165ee1 +GO_BUILDFLAGS= -ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -w -s" +GO_TARGET= ./cmd/${PORTNAME} + PLIST_FILES= bin/sockaddr -post-extract: - @${CP} -rp ${WRKSRC}/cmd/${PORTNAME}/vendor/* ${WRKSRC}/src/ - -do-build: - @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd/${PORTNAME}/ && \ - ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ - ${LOCALBASE}/bin/go build -ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -w -s" \ - -o ${PORTNAME} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/go-sockaddr/cmd/${PORTNAME}/${PORTNAME} \ - ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +post-patch: + @${LN} -s ${WRKSRC}/cmd/${PORTNAME}/vendor ${WRKSRC} .include <bsd.port.mk> Modified: head/sysutils/zrepl/Makefile ============================================================================== --- head/sysutils/zrepl/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/sysutils/zrepl/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -19,39 +19,39 @@ USE_RC_SUBR= zrepl GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} USE_GITHUB= yes GH_SUBDIR= src/github.com/zrepl/zrepl -GH_TUPLE= beorn7:perks:3a771d9:perks/src/github.com/beorn7/perks \ - fatih:color:v1.7.0:color/src/github.com/fatih/color \ - ftrvxmtrx:fd:c6d8003:fd/src/github.com/ftrvxmtrx/fd \ - gdamore:encoding:b23993c:encoding/src/github.com/gdamore/encoding \ - gdamore:tcell:v1.1.0:tcell/src/github.com/gdamore/tcell \ - go-logfmt:logfmt:v0.4.0:logfmt/src/github.com/go-logfmt/logfmt \ - golang:net:351d144:net/src/golang.org/x/net \ - golang:protobuf:v1.3.1:protobuf/src/github.com/golang/protobuf \ - golang:sync:e225da7:sync/src/golang.org/x/sync \ - golang:sys:4ed8d59:sys/src/golang.org/x/sys \ - golang:text:v0.3.0:go_text/src/golang.org/x/text \ - google:go-genproto:bd91e49:genproto/src/google.golang.org/genproto \ - google:uuid:v1.1.1:uuid/src/github.com/google/uuid \ - grpc:grpc-go:v1.17.0:grpc/src/google.golang.org/grpc \ - jinzhu:copier:db4671f:copier/src/github.com/jinzhu/copier \ - kr:pretty:cfb55aa:pretty/src/github.com/kr/pretty \ - kr:text:7cafcd8:text/src/github.com/kr/text \ - lucasb-eyer:go-colorful:v1.0:go_colorful/src/github.com/lucasb-eyer/go-colorful \ - mattn:go-isatty:v0.0.3:go_isatty/src/github.com/mattn/go-isatty \ - mattn:go-runewidth:v0.0.3:go_runewidth/src/github.com/mattn/go-runewidth \ - matttproud:golang_protobuf_extensions:v1.0.0:golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions \ - pkg:errors:v0.8.1:errors/src/github.com/pkg/errors \ - problame:go-netssh:09d6bc4:go_netssh/src/github.com/problame/go-netssh \ - problame:go-rwccmd:391d2c7:go_rwccmd/src/github.com/problame/go-rwccmd \ - prometheus:client_golang:e11c6ff:client_golang/src/github.com/prometheus/client_golang \ - prometheus:client_model:99fa1f4:client_model/src/github.com/prometheus/client_model \ - prometheus:common:d0f7cd6:common/src/github.com/prometheus/common \ - prometheus:procfs:8b1c2da:procfs/src/github.com/prometheus/procfs \ - spf13:cobra:b787445:cobra/src/github.com/spf13/cobra \ - spf13:pflag:v1.0.0:pflag/src/github.com/spf13/pflag \ - stretchr:testify:v1.1.4:testify/src/github.com/stretchr/testify \ - theckman:goconstraint:v1.11.0:goconstraint/src/github.com/theckman/goconstraint \ - zrepl:yaml-config:08227ad:yaml_config/src/github.com/zrepl/yaml-config +GH_TUPLE= beorn7:perks:3a771d9:perks/vendor/github.com/beorn7/perks \ + fatih:color:v1.7.0:color/vendor/github.com/fatih/color \ + ftrvxmtrx:fd:c6d8003:fd/vendor/github.com/ftrvxmtrx/fd \ + gdamore:encoding:b23993c:encoding/vendor/github.com/gdamore/encoding \ + gdamore:tcell:v1.1.0:tcell/vendor/github.com/gdamore/tcell \ + go-logfmt:logfmt:v0.4.0:logfmt/vendor/github.com/go-logfmt/logfmt \ + golang:net:351d144:net/vendor/golang.org/x/net \ + golang:protobuf:v1.3.1:protobuf/vendor/github.com/golang/protobuf \ + golang:sync:e225da7:sync/vendor/golang.org/x/sync \ + golang:sys:4ed8d59:sys/vendor/golang.org/x/sys \ + golang:text:v0.3.0:go_text/vendor/golang.org/x/text \ + google:go-genproto:bd91e49:genproto/vendor/google.golang.org/genproto \ + google:uuid:v1.1.1:uuid/vendor/github.com/google/uuid \ + grpc:grpc-go:v1.17.0:grpc/vendor/google.golang.org/grpc \ + jinzhu:copier:db4671f:copier/vendor/github.com/jinzhu/copier \ + kr:pretty:cfb55aa:pretty/vendor/github.com/kr/pretty \ + kr:text:7cafcd8:text/vendor/github.com/kr/text \ + lucasb-eyer:go-colorful:v1.0:go_colorful/vendor/github.com/lucasb-eyer/go-colorful \ + mattn:go-isatty:v0.0.3:go_isatty/vendor/github.com/mattn/go-isatty \ + mattn:go-runewidth:v0.0.3:go_runewidth/vendor/github.com/mattn/go-runewidth \ + matttproud:golang_protobuf_extensions:v1.0.0:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ + pkg:errors:v0.8.1:errors/vendor/github.com/pkg/errors \ + problame:go-netssh:09d6bc4:go_netssh/vendor/github.com/problame/go-netssh \ + problame:go-rwccmd:391d2c7:go_rwccmd/vendor/github.com/problame/go-rwccmd \ + prometheus:client_golang:e11c6ff:client_golang/vendor/github.com/prometheus/client_golang \ + prometheus:client_model:99fa1f4:client_model/vendor/github.com/prometheus/client_model \ + prometheus:common:d0f7cd6:common/vendor/github.com/prometheus/common \ + prometheus:procfs:8b1c2da:procfs/vendor/github.com/prometheus/procfs \ + spf13:cobra:b787445:cobra/vendor/github.com/spf13/cobra \ + spf13:pflag:v1.0.0:pflag/vendor/github.com/spf13/pflag \ + stretchr:testify:v1.1.4:testify/vendor/github.com/stretchr/testify \ + theckman:goconstraint:v1.11.0:goconstraint/vendor/github.com/theckman/goconstraint \ + zrepl:yaml-config:08227ad:yaml_config/vendor/github.com/zrepl/yaml-config SUB_FILES= pkg-message @@ -70,19 +70,13 @@ SUB_LIST+= DAEMON_LOGGING="-S -l \$${zrepl_facility} - SUB_LIST+= DAEMON_LOGGING="" .endif -post-extract: - ${LN} -sf ${WRKSRC}/src ${WRKDIR} - post-build-MANPAGES-on: @${MAKE_CMD} -C ${WRKSRC}/docs SPHINXBUILD=sphinx-build-${PYTHON_VER} man -do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin +post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/zrepl/samples ${INSTALL_DATA} ${WRKSRC}/dist/grafana/grafana-prometheus-zrepl-0.1.json ${STAGEDIR}${PREFIX}/share/zrepl/samples/ ${INSTALL_DATA} ${WRKSRC}/config/samples/* ${STAGEDIR}${PREFIX}/share/zrepl/samples/ - -post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d \ ${STAGEDIR}${PREFIX}/etc/syslog.d \ ${STAGEDIR}${PREFIX}/etc/zrepl \ Modified: head/textproc/consul-template/Makefile ============================================================================== --- head/textproc/consul-template/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/textproc/consul-template/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -21,13 +21,4 @@ PLIST_FILES= bin/consul-template USE_RC_SUBR= consul-template -do-build: - @cd ${WRKSRC}/src/github.com/hashicorp/consul-template ; \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build - -do-install: - ${INSTALL_PROGRAM} \ - ${WRKSRC}/src/github.com/hashicorp/consul-template/consul-template \ - ${STAGEDIR}${PREFIX}/bin/consul-template - .include <bsd.port.mk> Modified: head/textproc/gron/Makefile ============================================================================== --- head/textproc/gron/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/textproc/gron/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -15,24 +15,13 @@ LICENSE= MIT USES= go USE_GITHUB= yes GH_ACCOUNT= tomnomnom -GH_TUPLE= fatih:color:v1.7.0:color \ - mattn:go-colorable:v0.1.1:colorable \ - mattn:go-isatty:v0.0.6:isatty \ - nwidger:jsoncolor:75a6de4:jsoncolor \ - pkg:errors:v0.8.1:pkg_errors +GH_TUPLE= fatih:color:v1.7.0:color/vendor/github.com/fatih/color \ + mattn:go-colorable:v0.1.1:colorable/vendor/github.com/mattn/go-colorable \ + mattn:go-isatty:v0.0.6:isatty/vendor/github.com/mattn/go-isatty \ + nwidger:jsoncolor:75a6de4:jsoncolor/vendor/github.com/nwidger/jsoncolor \ + pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors GO_BUILDFLAGS= -ldflags="-X main.gronVersion=${PORTVERSION}" PLIST_FILES= bin/${PORTNAME} - -pre-build: - ${MKDIR} ${GO_WRKDIR_SRC}/github.com/fatih \ - ${GO_WRKDIR_SRC}/github.com/mattn \ - ${GO_WRKDIR_SRC}/github.com/pkg \ - ${GO_WRKDIR_SRC}/github.com/nwidger - ${MV} ${WRKSRC_color} ${GO_WRKDIR_SRC}/github.com/fatih/color - ${MV} ${WRKSRC_colorable} ${GO_WRKDIR_SRC}/github.com/mattn/go-colorable - ${MV} ${WRKSRC_isatty} ${GO_WRKDIR_SRC}/github.com/mattn/go-isatty - ${MV} ${WRKSRC_jsoncolor} ${GO_WRKDIR_SRC}/github.com/nwidger/jsoncolor - ${MV} ${WRKSRC_pkg_errors} ${GO_WRKDIR_SRC}/github.com/pkg/errors .include <bsd.port.mk> Modified: head/textproc/jid/Makefile ============================================================================== --- head/textproc/jid/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/textproc/jid/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -14,19 +14,17 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= simeji GH_SUBDIR= src/github.com/simeji/jid -GH_TUPLE= bitly:go-simplejson:aabad6e:simplejson/src/github.com/bitly/go-simplejson \ - fatih:color:7824417:color/src/github.com/fatih/color \ - mattn:go-runewidth:9e777a8:runewidth/src/github.com/mattn/go-runewidth \ - nsf:termbox-go:3540b76:termbox/src/github.com/nsf/termbox-go \ - nwidger:jsoncolor:75a6de4:jsoncolor/src/github.com/nwidger/jsoncolor \ - pkg:errors:645ef00:errors/src/github.com/pkg/errors +GH_TUPLE= bitly:go-simplejson:aabad6e:simplejson/vendor/github.com/bitly/go-simplejson \ + fatih:color:7824417:color/vendor/github.com/fatih/color \ + mattn:go-runewidth:9e777a8:runewidth/vendor/github.com/mattn/go-runewidth \ + nsf:termbox-go:3540b76:termbox/vendor/github.com/nsf/termbox-go \ + nwidger:jsoncolor:75a6de4:jsoncolor/vendor/github.com/nwidger/jsoncolor \ + pkg:errors:645ef00:errors/vendor/github.com/pkg/errors USES= go -PLIST_FILES= bin/jid +GO_TARGET= ./cmd/jid -do-build: - @(cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} ${GO_CMD} build -v -o ${GO_WRKDIR_BIN}/jid cmd/jid/jid.go) +PLIST_FILES= bin/jid .include <bsd.port.mk> Modified: head/textproc/minify/Makefile ============================================================================== --- head/textproc/minify/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/textproc/minify/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -28,7 +28,4 @@ GH_TUPLE= dustin:go-humanize:v1.0.0:dustin_go_humanize tdewolff:test:v1.0.4:tdewolff_test/vendor/github.com/tdewolff/test USE_GITHUB= yes -do-install: - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/minify ${STAGEDIR}${PREFIX}/bin/minify - .include <bsd.port.mk> Modified: head/textproc/sift/Makefile ============================================================================== --- head/textproc/sift/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/textproc/sift/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -20,13 +20,10 @@ GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} PLIST_FILES= bin/sift GH_ACCOUNT= svent -GH_TUPLE= golang:crypto:71b5226:golang_crypto/../src/golang.org/x/crypto \ - golang:sys:749cb33:golang_sys/../src/golang.org/x/sys \ - svent:go-flags:4bcbad3:svent_goflags/../src/github.com/svent/go-flags \ - svent:go-nbreader:7cef48d:svent_gonbreader/../src/github.com/svent/go-nbreader +GH_TUPLE= golang:crypto:71b5226:golang_crypto/vendor/golang.org/x/crypto \ + golang:sys:749cb33:golang_sys/vendor/golang.org/x/sys \ + svent:go-flags:4bcbad3:svent_goflags/vendor/github.com/svent/go-flags \ + svent:go-nbreader:7cef48d:svent_gonbreader/vendor/github.com/svent/go-nbreader USE_GITHUB= yes - -do-install: - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/sift ${STAGEDIR}${PREFIX}/bin/sift .include <bsd.port.mk> Modified: head/textproc/spiff/Makefile ============================================================================== --- head/textproc/spiff/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/textproc/spiff/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -13,6 +13,8 @@ USES= go USE_GITHUB= yes GH_ACCOUNT= cloudfoundry-incubator +GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} + PLIST_FILES= bin/spiff PORTDOCS= LICENSE README.md examples/cf-aws.yml \ @@ -20,28 +22,10 @@ PORTDOCS= LICENSE README.md examples/cf-aws.yml \ OPTIONS_DEFINE= DOCS -post-patch: - @cd ${WRKSRC} ; ${MV} ${WRKSRC}/vendor ${WRKSRC}/src - @cd ${WRKSRC} ; ${MKDIR} src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \ - ${MV} .gitignore LICENSE Makefile README.md \ - compare dynaml examples flow init_test.go scripts spiff.go \ - spiff_test.go yaml \ - src/github.com/${GH_ACCOUNT}/${GH_PROJECT} - -do-build: - @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build spiff.go - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/${PORTNAME} \ - ${STAGEDIR}${PREFIX}/bin/ - do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/LICENSE \ - ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/README.md \ - ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} && ${COPYTREE_SHARE} examples ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} examples ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/www/caddy/Makefile ============================================================================== --- head/www/caddy/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/www/caddy/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -20,6 +20,7 @@ USE_GITHUB= yes GH_ACCOUNT= mholt GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} +GO_TARGET= ./caddy SUB_FILES= pkg-message PLIST_FILES= bin/caddy etc/rc.d/caddy @@ -29,12 +30,7 @@ OPTIONS_DEFINE= TELEMETRY TELEMETRY_DESC= Enable telemetry support TELEMETRY_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-disable-telemetry -do-build: - @cd ${GO_WRKSRC}/${PORTNAME} && ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build - -do-install: - ${INSTALL_PROGRAM} ${GO_WRKSRC}/${PORTNAME}/${PORTNAME} \ - ${STAGEDIR}/${PREFIX}/bin/${PORTNAME} +post-install: ${INSTALL_SCRIPT} ${GO_WRKSRC}/dist/init/freebsd/${PORTNAME} \ ${STAGEDIR}/${PREFIX}/etc/rc.d/${PORTNAME} Modified: head/www/fabio/Makefile ============================================================================== --- head/www/fabio/Makefile Sun Sep 29 22:31:57 2019 (r513275) +++ head/www/fabio/Makefile Sun Sep 29 22:34:31 2019 (r513276) @@ -14,20 +14,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= go USE_GITHUB= yes GH_ACCOUNT= fabiolb -GH_PROJECT= fabio GH_SUBDIR= src/github.com/fabiolb/fabio *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909292234.x8TMYVBX090802>