Index: sysutils/datadog/Makefile
===================================================================
--- sysutils/datadog/Makefile	(revision 554957)
+++ sysutils/datadog/Makefile	(working copy)
@@ -11,253 +11,247 @@
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS=	i386 amd64
-ONLY_FOR_ARCHS_REASON=	various cgo modules fail on non-x86 architectures
-
-BUILD_DEPENDS=	go>=1.15:lang/go \
-		cmake>=3.18:devel/cmake \
+BUILD_DEPENDS=	cmake>=3.18:devel/cmake \
+		go>=1.15:lang/go \
 		go-bindata>0:devel/go-bindata
 
-USES=		go python:3.7+
+USES=		go:modules python:3.7+
 
-DATADOG_PREFIX=	${PREFIX}/bin/${PORTNAME}
-LOGDIR=		/var/log/${PORTNAME}
-RUNDIR=		/var/run/${PORTNAME}
-
+USE_LDCONFIG=	yes
 USE_GITHUB=	yes
-GH_ACCOUNT=	DataDog
 GH_PROJECT=	datadog-agent
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
-GH_SUBDIR=	src/github.com/DataDog/datadog-agent
 GH_TAGNAME=	${DISTVERSION}
-
-# For list of modules you can check:
-# https://github.com/DataDog/datadog-agent/blob/${DISTVERSION}/Gopkg.toml
 GH_TUPLE=	\
-		DataDog:agent-payload:v4.44.0:datadog_agent_payload/src/github.com/DataDog/agent-payload \
-		DataDog:cast:1ee8c8bd14a3:datadog_cast/src/github.com/spf13/cast \
-		DataDog:datadog-go:v3.5.0:datadog_datadog_go/src/github.com/DataDog/datadog-go \
-		DataDog:datadog-operator:9c71245c6822:datadog_datadog_operator/src/github.com/DataDog/datadog-operator \
-		DataDog:dd-trace-go:v1.23.1:datadog_dd_trace_go/src/gopkg.in/DataDog/dd-trace-go.v1 \
-		DataDog:ebpf:7a8f7d072a50:datadog_ebpf/src/github.com/DataDog/ebpf \
-		DataDog:gobpf:5f8313cb4d71:datadog_gobpf/src/github.com/iovisor/gobpf \
-		DataDog:gohai:e17d616e422a:datadog_gohai/src/github.com/DataDog/gohai \
-		DataDog:gopsutil:1b53412ef321:datadog_gopsutil/src/github.com/DataDog/gopsutil \
-		DataDog:mmh3:f5b682d8c981:datadog_mmh3/src/github.com/DataDog/mmh3 \
-		DataDog:viper:v1.8.0:datadog_viper/src/github.com/spf13/viper \
-		DataDog:watermarkpodautoscaler:v0.1.0:datadog_watermarkpodautoscaler/src/github.com/DataDog/watermarkpodautoscaler \
-		DataDog:zstd:2bf71ec48360:datadog_zstd/src/github.com/DataDog/zstd \
-		Knetic:govaluate:v3.0.0:knetic_govaluate/src/gopkg.in/Knetic/govaluate.v3 \
-		Masterminds:goutils:v1.1.0:masterminds_goutils/src/github.com/Masterminds/goutils \
-		Masterminds:semver:v1.5.0:masterminds_semver/src/github.com/Masterminds/semver \
-		Masterminds:sprig:v2.22.0:masterminds_sprig/src/github.com/Masterminds/sprig \
-		Microsoft:go-winio:fc70bd9a86b5:microsoft_go_winio/src/github.com/Microsoft/go-winio \
-		Microsoft:hcsshim:v0.8.7:microsoft_hcsshim/src/github.com/Microsoft/hcsshim \
-		NYTimes:gziphandler:v1.1.1:nytimes_gziphandler/src/github.com/NYTimes/gziphandler \
-		PuerkitoBio:purell:v1.1.1:puerkitobio_purell/src/github.com/PuerkitoBio/purell \
-		PuerkitoBio:urlesc:de5bf2ad4578:puerkitobio_urlesc/src/github.com/PuerkitoBio/urlesc \
-		StackExchange:wmi:e0a55b97c705:stackexchange_wmi/src/github.com/StackExchange/wmi \
-		alecthomas:participle:v0.4.4:alecthomas_participle/src/github.com/alecthomas/participle \
-		alecthomas:repr:d37bc2a10ba1:alecthomas_repr/src/github.com/alecthomas/repr \
-		armon:go-metrics:v0.3.0:armon_go_metrics/src/github.com/armon/go-metrics \
-		aws:aws-sdk-go:v1.30.5:aws_aws_sdk_go/src/github.com/aws/aws-sdk-go \
-		beevik:ntp:v0.3.0:beevik_ntp/src/github.com/beevik/ntp \
-		benesch:cgosymbolizer:bec6fe6e597b:benesch_cgosymbolizer/src/github.com/benesch/cgosymbolizer \
-		beorn7:perks:v1.0.1:beorn7_perks/src/github.com/beorn7/perks \
-		bhmj:jsonslice:92c3edaad8e2:bhmj_jsonslice/src/github.com/bhmj/jsonslice \
-		blabber:go-freebsd-sysctl:dcd5a22:go_freebsd_sysctl/src/github.com/blabber/go-freebsd-sysctl \
-		blang:semver:v3.5.1:blang_semver/src/github.com/blang/semver \
-		bmizerany:pat:6226ea591a40:bmizerany_pat/src/github.com/bmizerany/pat \
-		cenkalti:backoff:v2.2.1:cenkalti_backoff/src/github.com/cenkalti/backoff \
-		census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/src/go.opencensus.io \
-		cespare:xxhash:v1.1.0:cespare_xxhash/src/github.com/cespare/xxhash \
-		cihub:seelog:d2c6e5aa9fbf:cihub_seelog/src/github.com/cihub/seelog \
-		clbanning:mxj:v1.8.4:clbanning_mxj/src/github.com/clbanning/mxj \
-		cloudfoundry:bbs:d7bc971db0db:cloudfoundry_bbs/src/code.cloudfoundry.org/bbs \
-		cloudfoundry:cfhttp:v2.0.0:cloudfoundry_cfhttp/src/code.cloudfoundry.org/cfhttp/v2 \
-		cloudfoundry:garden:061eda450ad9:cloudfoundry_garden/src/code.cloudfoundry.org/garden \
-		cloudfoundry:lager:v2.0.0:cloudfoundry_lager/src/code.cloudfoundry.org/lager \
-		cloudfoundry:tlsconfig:bbe0f8da39b3:cloudfoundry_tlsconfig/src/code.cloudfoundry.org/tlsconfig \
-		containerd:cgroups:b44481373989:containerd_cgroups/src/github.com/containerd/cgroups \
-		containerd:containerd:v1.2.13:containerd_containerd/src/github.com/containerd/containerd \
-		containerd:continuity:0f16d7a0959c:containerd_continuity/src/github.com/containerd/continuity \
-		containerd:fifo:ff969a566b00:containerd_fifo/src/github.com/containerd/fifo \
-		containerd:typeurl:v1.0.0:containerd_typeurl/src/github.com/containerd/typeurl \
-		coreos:etcd:v3.3.15:coreos_etcd/src/github.com/coreos/etcd \
-		coreos:go-semver:v0.3.0:coreos_go_semver/src/github.com/coreos/go-semver \
-		coreos:go-systemd:40e2722dffea:coreos_go_systemd/src/github.com/coreos/go-systemd \
-		coreos:pkg:399ea9e2e55f:coreos_pkg/src/github.com/coreos/pkg \
-		datadog:extendeddaemonset:94ec1f3a5192:datadog_extendeddaemonset/src/github.com/datadog/extendeddaemonset \
-		davecgh:go-spew:v1.1.1:davecgh_go_spew/src/github.com/davecgh/go-spew \
-		dgraph-io:ristretto:v0.0.3:dgraph_io_ristretto/src/github.com/dgraph-io/ristretto \
-		dgryski:go-jump:e1f439676b57:dgryski_go_jump/src/github.com/dgryski/go-jump \
-		docker:distribution:0ac367fd6bee:docker_distribution/src/github.com/docker/distribution \
-		docker:go-connections:v0.4.0:docker_go_connections/src/github.com/docker/go-connections \
-		docker:go-events:e31b211e4f1c:docker_go_events/src/github.com/docker/go-events \
-		docker:go-units:v0.4.0:docker_go_units/src/github.com/docker/go-units \
-		docker:spdystream:449fdfce4d96:docker_spdystream/src/github.com/docker/spdystream \
-		dsnet:compress:v0.0.1:dsnet_compress/src/github.com/dsnet/compress \
-		dustin:go-humanize:v1.0.0:dustin_go_humanize/src/github.com/dustin/go-humanize \
-		elastic:go-libaudit:v0.4.0:elastic_go_libaudit/src/github.com/elastic/go-libaudit \
-		emicklei:go-restful-swagger12:7524189396c6:emicklei_go_restful_swagger12/src/github.com/emicklei/go-restful-swagger12 \
-		emicklei:go-restful:v2.9.6:emicklei_go_restful/src/github.com/emicklei/go-restful \
-		etcd-io:etcd:3cf2f69b5738:etcd_io_etcd/src/go.etcd.io/etcd \
-		evanphx:json-patch:v4.5.0:evanphx_json_patch/src/github.com/evanphx/json-patch \
-		fatih:color:v1.9.0:fatih_color/src/github.com/fatih/color \
-		florianl:go-conntrack:v0.2.0:florianl_go_conntrack/src/github.com/florianl/go-conntrack \
-		florianl:go-tc:v0.1.0:florianl_go_tc/src/github.com/florianl/go-tc \
-		freddierice:go-losetup:fc9adea44124:freddierice_go_losetup/src/github.com/freddierice/go-losetup \
-		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/src/github.com/fsnotify/fsnotify \
-		ghodss:yaml:25d852aebe32:ghodss_yaml/src/github.com/ghodss/yaml \
-		go-inf:inf:v0.9.1:go_inf_inf/src/gopkg.in/inf.v0 \
-		go-ini:ini:v1.55.0:go_ini_ini/src/github.com/go-ini/ini \
-		go-ole:go-ole:v1.2.4:go_ole_go_ole/src/github.com/go-ole/go-ole \
-		go-openapi:jsonpointer:v0.19.3:go_openapi_jsonpointer/src/github.com/go-openapi/jsonpointer \
-		go-openapi:jsonreference:v0.19.2:go_openapi_jsonreference/src/github.com/go-openapi/jsonreference \
-		go-openapi:spec:v0.19.8:go_openapi_spec/src/github.com/go-openapi/spec \
-		go-openapi:swag:v0.19.5:go_openapi_swag/src/github.com/go-openapi/swag \
-		go-yaml:yaml:v2.2.8:go_yaml_yaml/src/gopkg.in/yaml.v2 \
-		gobwas:glob:v0.2.3:gobwas_glob/src/github.com/gobwas/glob \
-		godbus:dbus:v4.1.0:godbus_dbus/src/github.com/godbus/dbus \
-		gogo:googleapis:v1.3.2:gogo_googleapis/src/github.com/gogo/googleapis \
-		gogo:protobuf:v1.3.1:gogo_protobuf/src/github.com/gogo/protobuf \
-		golang:appengine:v1.6.5:golang_appengine/src/google.golang.org/appengine \
-		golang:crypto:75b288015ac9:golang_crypto/src/golang.org/x/crypto \
-		golang:glog:23def4e6c14b:golang_glog/src/github.com/golang/glog \
-		golang:groupcache:8c9f03a8e57e:golang_groupcache/src/github.com/golang/groupcache \
-		golang:mobile:d2bd2a29d028:golang_mobile/src/golang.org/x/mobile \
-		golang:net:c89045814202:golang_net/src/golang.org/x/net \
-		golang:oauth2:bf48bf16ab8d:golang_oauth2/src/golang.org/x/oauth2 \
-		golang:protobuf:v1.3.2:golang_protobuf/src/github.com/golang/protobuf \
-		golang:snappy:v0.0.1:golang_snappy/src/github.com/golang/snappy \
-		golang:sync:cd5d95a43a6e:golang_sync/src/golang.org/x/sync \
-		golang:sys:196b9ba8737a:golang_sys/src/golang.org/x/sys \
-		golang:text:v0.3.2:golang_text/src/golang.org/x/text \
-		golang:time:555d28b269f0:golang_time/src/golang.org/x/time \
-		golang:tools:82bb89366a1e:golang_tools/src/golang.org/x/tools \
-		golang:xerrors:5ec99f83aff1:golang_xerrors/src/golang.org/x/xerrors \
-		gomodules:jsonpatch:v3.0.1:gomodules_jsonpatch/src/gomodules.xyz/jsonpatch/v3 \
-		gomodules:orderedmap:v0.1.0:gomodules_orderedmap/src/gomodules.xyz/orderedmap \
-		google:go-cmp:v0.4.0:google_go_cmp/src/github.com/google/go-cmp \
-		google:go-genproto:09dca8ec2884:google_go_genproto/src/google.golang.org/genproto \
-		google:gofuzz:v1.0.0:google_gofuzz/src/github.com/google/gofuzz \
-		google:gopacket:v1.1.17:google_gopacket/src/github.com/google/gopacket \
-		google:uuid:v1.1.1:google_uuid/src/github.com/google/uuid \
-		googleapis:gnostic:v0.3.1:googleapis_gnostic/src/github.com/googleapis/gnostic \
-		gorilla:mux:v1.7.4:gorilla_mux/src/github.com/gorilla/mux \
-		grpc-ecosystem:go-grpc-middleware:v1.2.0:grpc_ecosystem_go_grpc_middleware/src/github.com/grpc-ecosystem/go-grpc-middleware \
-		grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/src/github.com/grpc-ecosystem/go-grpc-prometheus \
-		grpc-ecosystem:grpc-gateway:v1.12.2:grpc_ecosystem_grpc_gateway/src/github.com/grpc-ecosystem/grpc-gateway \
-		grpc:grpc-go:v1.26.0:grpc_grpc_go/src/google.golang.org/grpc \
-		hashicorp:consul:v1.4.0:hashicorp_consul_api/src/github.com/hashicorp/consul \
-		hashicorp:errwrap:v1.0.0:hashicorp_errwrap/src/github.com/hashicorp/errwrap \
-		hashicorp:go-cleanhttp:v0.5.1:hashicorp_go_cleanhttp/src/github.com/hashicorp/go-cleanhttp \
-		hashicorp:go-hclog:v0.12.0:hashicorp_go_hclog/src/github.com/hashicorp/go-hclog \
-		hashicorp:go-immutable-radix:v1.1.0:hashicorp_go_immutable_radix/src/github.com/hashicorp/go-immutable-radix \
-		hashicorp:go-multierror:v1.0.0:hashicorp_go_multierror/src/github.com/hashicorp/go-multierror \
-		hashicorp:go-rootcerts:v1.0.2:hashicorp_go_rootcerts/src/github.com/hashicorp/go-rootcerts \
-		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/src/github.com/hashicorp/golang-lru \
-		hashicorp:hcl:v1.0.0:hashicorp_hcl/src/github.com/hashicorp/hcl \
-		hashicorp:serf:v0.8.5:hashicorp_serf/src/github.com/hashicorp/serf \
-		hectane:go-acl:da78bae5fc95:hectane_go_acl/src/github.com/hectane/go-acl \
-		huandu:xstrings:v1.2.0:huandu_xstrings/src/github.com/huandu/xstrings \
-		ianlancetaylor:cgosymbolizer:f5072df9c550:ianlancetaylor_cgosymbolizer/src/github.com/ianlancetaylor/cgosymbolizer \
-		imdario:mergo:v0.3.7:imdario_mergo/src/github.com/imdario/mergo \
-		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/src/github.com/inconshreveable/mousetrap \
-		itchyny:astgen-go:aaa595cf980e:itchyny_astgen_go/src/github.com/itchyny/astgen-go \
-		itchyny:gojq:v0.10.2:itchyny_gojq/src/github.com/itchyny/gojq \
-		jmespath:go-jmespath:v0.3.0:jmespath_go_jmespath/src/github.com/jmespath/go-jmespath \
-		json-iterator:go:v1.1.9:json_iterator_go/src/github.com/json-iterator/go \
-		kardianos:osext:2bc1f35cddc0:kardianos_osext/src/github.com/kardianos/osext \
-		konsorten:go-windows-terminal-sequences:v1.0.3:konsorten_go_windows_terminal_sequences/src/github.com/konsorten/go-windows-terminal-sequences \
-		kubernetes-incubator:custom-metrics-apiserver:3d9be26a50eb:kubernetes_incubator_custom_metrics_apiserver/src/github.com/kubernetes-incubator/custom-metrics-apiserver \
-		kubernetes-sigs:controller-runtime:v0.5.2:kubernetes_sigs_controller_runtime/src/sigs.k8s.io/controller-runtime \
-		kubernetes-sigs:structured-merge-diff:6149e4549fca:kubernetes_sigs_structured_merge_diff/src/sigs.k8s.io/structured-merge-diff \
-		kubernetes-sigs:yaml:v1.1.0:kubernetes_sigs_yaml/src/sigs.k8s.io/yaml \
-		kubernetes:api:35e52d86657a:kubernetes_api/src/k8s.io/api \
-		kubernetes:apiextensions-apiserver:5357c4baaf65:kubernetes_apiextensions_apiserver/src/k8s.io/apiextensions-apiserver \
-		kubernetes:apimachinery:a2eda9f80ab8:kubernetes_apimachinery/src/k8s.io/apimachinery \
-		kubernetes:apiserver:5190913f932d:kubernetes_apiserver/src/k8s.io/apiserver \
-		kubernetes:autoscaler:fa95810cfc1e:kubernetes_autoscaler/src/k8s.io/autoscaler/vertical-pod-autoscaler \
-		kubernetes:client-go:bec269661e48:kubernetes_client_go/src/k8s.io/client-go \
-		kubernetes:cloud-provider:20453efc2458:kubernetes_cloud_provider/src/k8s.io/cloud-provider \
-		kubernetes:component-base:039242c015a9:kubernetes_component_base/src/k8s.io/component-base \
-		kubernetes:cri-api:608eb1dad4ac:kubernetes_cri_api/src/k8s.io/cri-api \
-		kubernetes:klog:4ad0115ba9e4:kubernetes_klog/src/k8s.io/klog \
-		kubernetes:kube-openapi:30be4d16710a:kubernetes_kube_openapi/src/k8s.io/kube-openapi \
-		kubernetes:kube-state-metrics:dbbe062e36a4:kubernetes_kube_state_metrics/src/k8s.io/kube-state-metrics \
-		kubernetes:kubernetes:v1.16.2:kubernetes_kubernetes/src/k8s.io/kubernetes \
-		kubernetes:metrics:3b1a734dba6e:kubernetes_metrics/src/k8s.io/metrics \
-		kubernetes:utils:94aeca20bf09:kubernetes_utils/src/k8s.io/utils \
-		lestrrat-go:strftime:v1.0.1:lestrrat_go_strftime/src/github.com/lestrrat-go/strftime \
-		lxn:walk:02935bac0ab8:lxn_walk/src/github.com/lxn/walk \
-		lxn:win:2da648fda5b4:lxn_win/src/github.com/lxn/win \
-		magiconair:properties:v1.8.1:magiconair_properties/src/github.com/magiconair/properties \
-		mailru:easyjson:b2ccc519800e:mailru_easyjson/src/github.com/mailru/easyjson \
-		mattn:go-colorable:v0.1.6:mattn_go_colorable/src/github.com/mattn/go-colorable \
-		mattn:go-isatty:v0.0.12:mattn_go_isatty/src/github.com/mattn/go-isatty \
-		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions \
-		mdlayher:netlink:v1.1.0:mdlayher_netlink/src/github.com/mdlayher/netlink \
-		mholt:archiver:26cf5bb32d07:mholt_archiver/src/github.com/mholt/archiver \
-		miekg:dns:v1.1.31:miekg_dns/src/github.com/miekg/dns \
-		mitchellh:copystructure:v1.0.0:mitchellh_copystructure/src/github.com/mitchellh/copystructure \
-		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/src/github.com/mitchellh/go-homedir \
-		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/src/github.com/mitchellh/mapstructure \
-		mitchellh:reflectwalk:v1.0.0:mitchellh_reflectwalk/src/github.com/mitchellh/reflectwalk \
-		moby:sys:mountinfo/v0.1.3:moby_sys_mountinfo/src/github.com/moby/sys \
-		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/src/github.com/modern-go/concurrent \
-		modern-go:reflect2:v1.0.1:modern_go_reflect2/src/github.com/modern-go/reflect2 \
-		munnerz:goautoneg:a547fc61f48d:munnerz_goautoneg/src/github.com/munnerz/goautoneg \
-		natefinch:lumberjack:v2.0.0:natefinch_lumberjack/src/gopkg.in/natefinch/lumberjack.v2 \
-		nwaples:rardecode:v1.1.0:nwaples_rardecode/src/github.com/nwaples/rardecode \
-		opencontainers:go-digest:v1.0.0-rc1:opencontainers_go_digest/src/github.com/opencontainers/go-digest \
-		opencontainers:image-spec:v1.0.1:opencontainers_image_spec/src/github.com/opencontainers/image-spec \
-		opencontainers:runc:6cc515888830:opencontainers_runc/src/github.com/opencontainers/runc \
-		opencontainers:runtime-spec:v1.0.2:opencontainers_runtime_spec/src/github.com/opencontainers/runtime-spec \
-		openshift:api:32369d4db2ad:openshift_api/src/github.com/openshift/api \
-		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/src/github.com/patrickmn/go-cache \
-		pbnjay:strptime:5c05b0d668c9:pbnjay_strptime/src/github.com/pbnjay/strptime \
-		pborman:uuid:v1.2.0:pborman_uuid/src/github.com/pborman/uuid \
-		pelletier:go-toml:v1.2.0:pelletier_go_toml/src/github.com/pelletier/go-toml \
-		philhofer:fwd:v1.0.0:philhofer_fwd/src/github.com/philhofer/fwd \
-		pierrec:lz4:v2.5.0:pierrec_lz4/src/github.com/pierrec/lz4 \
-		pkg:errors:v0.9.1:pkg_errors/src/github.com/pkg/errors \
-		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/src/github.com/pmezard/go-difflib \
-		prometheus:client_golang:v0.9.2:prometheus_client_golang/src/github.com/prometheus/client_golang \
-		prometheus:client_model:v0.2.0:prometheus_client_model/src/github.com/prometheus/client_model \
-		prometheus:common:v0.9.1:prometheus_common/src/github.com/prometheus/common \
-		prometheus:procfs:v0.0.6:prometheus_procfs/src/github.com/prometheus/procfs \
-		robfig:cron:v3.0.0:robfig_cron_v3/src/github.com/robfig/cron/v3 \
-		samuel:go-zookeeper:2cc03de413da:samuel_go_zookeeper/src/github.com/samuel/go-zookeeper \
-		shirou:gopsutil:d5eecd68:shirou_gopsutil/src/github.com/shirou/gopsutil \
-		shirou:w32:bb4de0191aa4:shirou_w32/src/github.com/shirou/w32 \
-		shuLhan:go-bindata:v3.4.0:shulhan_go_bindata/src/github.com/shuLhan/go-bindata \
-		sirupsen:logrus:v1.6.0:sirupsen_logrus/src/github.com/sirupsen/logrus \
-		soniah:gosnmp:v1.26.0:soniah_gosnmp/src/github.com/soniah/gosnmp \
-		spf13:afero:v1.2.2:spf13_afero/src/github.com/spf13/afero \
-		spf13:cobra:v0.0.5:spf13_cobra/src/github.com/spf13/cobra \
-		spf13:jwalterweatherman:v1.1.0:spf13_jwalterweatherman/src/github.com/spf13/jwalterweatherman \
-		spf13:pflag:v1.0.5:spf13_pflag/src/github.com/spf13/pflag \
-		stretchr:objx:v0.2.0:stretchr_objx/src/github.com/stretchr/objx \
-		stretchr:testify:v1.5.1:stretchr_testify/src/github.com/stretchr/testify \
-		syndtr:gocapability:d98352740cb2:syndtr_gocapability/src/github.com/syndtr/gocapability \
-		tedsuo:rata:v1.0.0:tedsuo_rata/src/github.com/tedsuo/rata \
-		tinylib:msgp:v1.1.2:tinylib_msgp/src/github.com/tinylib/msgp \
-		twmb:murmur3:v1.1.3:twmb_murmur3/src/github.com/twmb/murmur3 \
-		uber-go:atomic:v1.6.0:uber_go_atomic/src/go.uber.org/atomic \
-		uber-go:multierr:v1.5.0:uber_go_multierr/src/go.uber.org/multierr \
-		uber-go:zap:v1.14.1:uber_go_zap/src/go.uber.org/zap \
-		ulikunitz:xz:v0.5.7:ulikunitz_xz/src/github.com/ulikunitz/xz \
-		urfave:negroni:v1.0.0:urfave_negroni/src/github.com/urfave/negroni \
+		DataDog:agent-payload:v4.44.0:datadog_agent_payload/vendor/github.com/DataDog/agent-payload \
+		DataDog:cast:1ee8c8bd14a3:datadog_cast/vendor/github.com/spf13/cast \
+		DataDog:datadog-go:v3.5.0:datadog_datadog_go/vendor/github.com/DataDog/datadog-go \
+		DataDog:datadog-operator:9c71245c6822:datadog_datadog_operator/vendor/github.com/DataDog/datadog-operator \
+		DataDog:dd-trace-go:v1.23.1:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \
+		DataDog:ebpf:7a8f7d072a50:datadog_ebpf/vendor/github.com/DataDog/ebpf \
+		DataDog:gobpf:5f8313cb4d71:datadog_gobpf/vendor/github.com/iovisor/gobpf \
+		DataDog:gohai:e17d616e422a:datadog_gohai/vendor/github.com/DataDog/gohai \
+		DataDog:gopsutil:1b53412ef321:datadog_gopsutil/vendor/github.com/DataDog/gopsutil \
+		DataDog:mmh3:f5b682d8c981:datadog_mmh3/vendor/github.com/DataDog/mmh3 \
+		DataDog:viper:v1.8.0:datadog_viper/vendor/github.com/spf13/viper \
+		DataDog:watermarkpodautoscaler:v0.1.0:datadog_watermarkpodautoscaler/vendor/github.com/DataDog/watermarkpodautoscaler \
+		DataDog:zstd:2bf71ec48360:datadog_zstd/vendor/github.com/DataDog/zstd \
+		Knetic:govaluate:v3.0.0:knetic_govaluate/vendor/gopkg.in/Knetic/govaluate.v3 \
+		Masterminds:goutils:v1.1.0:masterminds_goutils/vendor/github.com/Masterminds/goutils \
+		Masterminds:semver:v1.5.0:masterminds_semver/vendor/github.com/Masterminds/semver \
+		Masterminds:sprig:v2.22.0:masterminds_sprig/vendor/github.com/Masterminds/sprig \
+		Microsoft:go-winio:fc70bd9a86b5:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
+		Microsoft:hcsshim:v0.8.7:microsoft_hcsshim/vendor/github.com/Microsoft/hcsshim \
+		NYTimes:gziphandler:v1.1.1:nytimes_gziphandler/vendor/github.com/NYTimes/gziphandler \
+		PuerkitoBio:purell:v1.1.1:puerkitobio_purell/vendor/github.com/PuerkitoBio/purell \
+		PuerkitoBio:urlesc:de5bf2ad4578:puerkitobio_urlesc/vendor/github.com/PuerkitoBio/urlesc \
+		StackExchange:wmi:e0a55b97c705:stackexchange_wmi/vendor/github.com/StackExchange/wmi \
+		alecthomas:participle:v0.4.4:alecthomas_participle/vendor/github.com/alecthomas/participle \
+		alecthomas:repr:d37bc2a10ba1:alecthomas_repr/vendor/github.com/alecthomas/repr \
+		armon:go-metrics:v0.3.0:armon_go_metrics/vendor/github.com/armon/go-metrics \
+		aws:aws-sdk-go:v1.30.5:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+		beevik:ntp:v0.3.0:beevik_ntp/vendor/github.com/beevik/ntp \
+		benesch:cgosymbolizer:bec6fe6e597b:benesch_cgosymbolizer/vendor/github.com/benesch/cgosymbolizer \
+		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
+		bhmj:jsonslice:92c3edaad8e2:bhmj_jsonslice/vendor/github.com/bhmj/jsonslice \
+		blabber:go-freebsd-sysctl:30a4aca6b547:blabber_go_freebsd_sysctl/vendor/github.com/blabber/go-freebsd-sysctl \
+		blang:semver:v3.5.1:blang_semver/vendor/github.com/blang/semver \
+		bmizerany:pat:6226ea591a40:bmizerany_pat/vendor/github.com/bmizerany/pat \
+		bouk:monkey:v1.0.1:bouk_monkey/vendor/bou.ke/monkey \
+		cenkalti:backoff:v2.2.1:cenkalti_backoff/vendor/github.com/cenkalti/backoff \
+		census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
+		cespare:xxhash:v1.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash \
+		cihub:seelog:d2c6e5aa9fbf:cihub_seelog/vendor/github.com/cihub/seelog \
+		clbanning:mxj:v1.8.4:clbanning_mxj/vendor/github.com/clbanning/mxj \
+		cloudfoundry:bbs:d7bc971db0db:cloudfoundry_bbs/vendor/code.cloudfoundry.org/bbs \
+		cloudfoundry:cfhttp:v2.0.0:cloudfoundry_cfhttp/vendor/code.cloudfoundry.org/cfhttp/v2 \
+		cloudfoundry:garden:061eda450ad9:cloudfoundry_garden/vendor/code.cloudfoundry.org/garden \
+		cloudfoundry:lager:v2.0.0:cloudfoundry_lager/vendor/code.cloudfoundry.org/lager \
+		cloudfoundry:tlsconfig:bbe0f8da39b3:cloudfoundry_tlsconfig/vendor/code.cloudfoundry.org/tlsconfig \
+		containerd:cgroups:b44481373989:containerd_cgroups/vendor/github.com/containerd/cgroups \
+		containerd:containerd:v1.2.13:containerd_containerd/vendor/github.com/containerd/containerd \
+		containerd:continuity:0f16d7a0959c:containerd_continuity/vendor/github.com/containerd/continuity \
+		containerd:fifo:ff969a566b00:containerd_fifo/vendor/github.com/containerd/fifo \
+		containerd:typeurl:v1.0.0:containerd_typeurl/vendor/github.com/containerd/typeurl \
+		coreos:etcd:v3.3.15:coreos_etcd/vendor/github.com/coreos/etcd \
+		coreos:go-semver:v0.3.0:coreos_go_semver/vendor/github.com/coreos/go-semver \
+		coreos:go-systemd:40e2722dffea:coreos_go_systemd/vendor/github.com/coreos/go-systemd \
+		coreos:pkg:399ea9e2e55f:coreos_pkg/vendor/github.com/coreos/pkg \
+		datadog:extendeddaemonset:94ec1f3a5192:datadog_extendeddaemonset/vendor/github.com/datadog/extendeddaemonset \
+		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
+		dgraph-io:ristretto:v0.0.3:dgraph_io_ristretto/vendor/github.com/dgraph-io/ristretto \
+		dgryski:go-jump:e1f439676b57:dgryski_go_jump/vendor/github.com/dgryski/go-jump \
+		docker:distribution:0ac367fd6bee:docker_distribution/vendor/github.com/docker/distribution \
+		moby:moby:v17.12.0-ce:moby_moby/vendor/github.com/docker/docker \
+		docker:go-connections:v0.4.0:docker_go_connections/vendor/github.com/docker/go-connections \
+		docker:go-events:e31b211e4f1c:docker_go_events/vendor/github.com/docker/go-events \
+		docker:go-units:v0.4.0:docker_go_units/vendor/github.com/docker/go-units \
+		docker:spdystream:449fdfce4d96:docker_spdystream/vendor/github.com/docker/spdystream \
+		dsnet:compress:v0.0.1:dsnet_compress/vendor/github.com/dsnet/compress \
+		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
+		elastic:go-libaudit:v0.4.0:elastic_go_libaudit/vendor/github.com/elastic/go-libaudit \
+		emicklei:go-restful-swagger12:7524189396c6:emicklei_go_restful_swagger12/vendor/github.com/emicklei/go-restful-swagger12 \
+		emicklei:go-restful:v2.9.6:emicklei_go_restful/vendor/github.com/emicklei/go-restful \
+		etcd-io:etcd:3cf2f69b5738:etcd_io_etcd/vendor/go.etcd.io/etcd \
+		evanphx:json-patch:v4.5.0:evanphx_json_patch/vendor/github.com/evanphx/json-patch \
+		fatih:color:v1.9.0:fatih_color/vendor/github.com/fatih/color \
+		florianl:go-conntrack:v0.2.0:florianl_go_conntrack/vendor/github.com/florianl/go-conntrack \
+		florianl:go-tc:v0.1.0:florianl_go_tc/vendor/github.com/florianl/go-tc \
+		freddierice:go-losetup:fc9adea44124:freddierice_go_losetup/vendor/github.com/freddierice/go-losetup \
+		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
+		ghodss:yaml:25d852aebe32:ghodss_yaml/vendor/github.com/ghodss/yaml \
+		go-inf:inf:v0.9.1:go_inf_inf/vendor/gopkg.in/inf.v0 \
+		go-ini:ini:v1.55.0:go_ini_ini/vendor/github.com/go-ini/ini \
+		go-ole:go-ole:v1.2.4:go_ole_go_ole/vendor/github.com/go-ole/go-ole \
+		go-openapi:jsonpointer:v0.19.3:go_openapi_jsonpointer/vendor/github.com/go-openapi/jsonpointer \
+		go-openapi:jsonreference:v0.19.2:go_openapi_jsonreference/vendor/github.com/go-openapi/jsonreference \
+		go-openapi:spec:v0.19.8:go_openapi_spec/vendor/github.com/go-openapi/spec \
+		go-openapi:swag:v0.19.5:go_openapi_swag/vendor/github.com/go-openapi/swag \
+		go-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		gobwas:glob:v0.2.3:gobwas_glob/vendor/github.com/gobwas/glob \
+		godbus:dbus:v4.1.0:godbus_dbus/vendor/github.com/godbus/dbus \
+		gogo:googleapis:v1.3.2:gogo_googleapis/vendor/github.com/gogo/googleapis \
+		gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
+		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
+		golang:crypto:75b288015ac9:golang_crypto/vendor/golang.org/x/crypto \
+		golang:glog:23def4e6c14b:golang_glog/vendor/github.com/golang/glog \
+		golang:groupcache:8c9f03a8e57e:golang_groupcache/vendor/github.com/golang/groupcache \
+		golang:mobile:d2bd2a29d028:golang_mobile/vendor/golang.org/x/mobile \
+		golang:net:c89045814202:golang_net/vendor/golang.org/x/net \
+		golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \
+		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:snappy:v0.0.1:golang_snappy/vendor/github.com/golang/snappy \
+		golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:196b9ba8737a:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
+		golang:time:555d28b269f0:golang_time/vendor/golang.org/x/time \
+		golang:tools:82bb89366a1e:golang_tools/vendor/golang.org/x/tools \
+		golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
+		gomodules:jsonpatch:v3.0.1:gomodules_jsonpatch/vendor/gomodules.xyz/jsonpatch/v3 \
+		gomodules:orderedmap:v0.1.0:gomodules_orderedmap/vendor/gomodules.xyz/orderedmap \
+		google:go-cmp:v0.4.0:google_go_cmp/vendor/github.com/google/go-cmp \
+		google:go-genproto:09dca8ec2884:google_go_genproto/vendor/google.golang.org/genproto \
+		google:gofuzz:v1.0.0:google_gofuzz/vendor/github.com/google/gofuzz \
+		google:gopacket:v1.1.17:google_gopacket/vendor/github.com/google/gopacket \
+		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
+		googleapis:gnostic:v0.3.1:googleapis_gnostic/vendor/github.com/googleapis/gnostic \
+		gorilla:mux:v1.7.4:gorilla_mux/vendor/github.com/gorilla/mux \
+		grpc-ecosystem:go-grpc-middleware:v1.2.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
+		grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \
+		grpc-ecosystem:grpc-gateway:v1.12.2:grpc_ecosystem_grpc_gateway/vendor/github.com/grpc-ecosystem/grpc-gateway \
+		grpc:grpc-go:v1.26.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+		hashicorp:consul:v1.4.0:hashicorp_consul_api/vendor/github.com/hashicorp/consul \
+		hashicorp:errwrap:v1.0.0:hashicorp_errwrap/vendor/github.com/hashicorp/errwrap \
+		hashicorp:go-cleanhttp:v0.5.1:hashicorp_go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \
+		hashicorp:go-hclog:v0.12.0:hashicorp_go_hclog/vendor/github.com/hashicorp/go-hclog \
+		hashicorp:go-immutable-radix:v1.1.0:hashicorp_go_immutable_radix/vendor/github.com/hashicorp/go-immutable-radix \
+		hashicorp:go-multierror:v1.0.0:hashicorp_go_multierror/vendor/github.com/hashicorp/go-multierror \
+		hashicorp:go-rootcerts:v1.0.2:hashicorp_go_rootcerts/vendor/github.com/hashicorp/go-rootcerts \
+		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
+		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
+		hashicorp:serf:v0.8.5:hashicorp_serf/vendor/github.com/hashicorp/serf \
+		hectane:go-acl:da78bae5fc95:hectane_go_acl/vendor/github.com/hectane/go-acl \
+		huandu:xstrings:v1.2.0:huandu_xstrings/vendor/github.com/huandu/xstrings \
+		ianlancetaylor:cgosymbolizer:f5072df9c550:ianlancetaylor_cgosymbolizer/vendor/github.com/ianlancetaylor/cgosymbolizer \
+		imdario:mergo:v0.3.7:imdario_mergo/vendor/github.com/imdario/mergo \
+		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
+		itchyny:astgen-go:aaa595cf980e:itchyny_astgen_go/vendor/github.com/itchyny/astgen-go \
+		itchyny:gojq:v0.10.2:itchyny_gojq/vendor/github.com/itchyny/gojq \
+		jmespath:go-jmespath:v0.3.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
+		json-iterator:go:v1.1.9:json_iterator_go/vendor/github.com/json-iterator/go \
+		kardianos:osext:2bc1f35cddc0:kardianos_osext/vendor/github.com/kardianos/osext \
+		konsorten:go-windows-terminal-sequences:v1.0.3:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
+		kubernetes-incubator:custom-metrics-apiserver:3d9be26a50eb:kubernetes_incubator_custom_metrics_apiserver/vendor/github.com/kubernetes-incubator/custom-metrics-apiserver \
+		kubernetes-sigs:controller-runtime:v0.5.2:kubernetes_sigs_controller_runtime/vendor/sigs.k8s.io/controller-runtime \
+		kubernetes-sigs:structured-merge-diff:6149e4549fca:kubernetes_sigs_structured_merge_diff/vendor/sigs.k8s.io/structured-merge-diff \
+		kubernetes-sigs:yaml:v1.1.0:kubernetes_sigs_yaml/vendor/sigs.k8s.io/yaml \
+		kubernetes:api:35e52d86657a:kubernetes_api/vendor/k8s.io/api \
+		kubernetes:apiextensions-apiserver:5357c4baaf65:kubernetes_apiextensions_apiserver/vendor/k8s.io/apiextensions-apiserver \
+		kubernetes:apimachinery:a2eda9f80ab8:kubernetes_apimachinery/vendor/k8s.io/apimachinery \
+		kubernetes:apiserver:5190913f932d:kubernetes_apiserver/vendor/k8s.io/apiserver \
+		kubernetes:autoscaler:fa95810cfc1e:kubernetes_autoscaler/vendor/k8s.io/autoscaler/vertical-pod-autoscaler \
+		kubernetes:client-go:bec269661e48:kubernetes_client_go/vendor/k8s.io/client-go \
+		kubernetes:cloud-provider:20453efc2458:kubernetes_cloud_provider/vendor/k8s.io/cloud-provider \
+		kubernetes:component-base:039242c015a9:kubernetes_component_base/vendor/k8s.io/component-base \
+		kubernetes:cri-api:608eb1dad4ac:kubernetes_cri_api/vendor/k8s.io/cri-api \
+		kubernetes:klog:4ad0115ba9e4:kubernetes_klog/vendor/k8s.io/klog \
+		kubernetes:kube-openapi:30be4d16710a:kubernetes_kube_openapi/vendor/k8s.io/kube-openapi \
+		kubernetes:kube-state-metrics:dbbe062e36a4:kubernetes_kube_state_metrics/vendor/k8s.io/kube-state-metrics \
+		kubernetes:kubernetes:v1.16.2:kubernetes_kubernetes/vendor/k8s.io/kubernetes \
+		kubernetes:metrics:3b1a734dba6e:kubernetes_metrics/vendor/k8s.io/metrics \
+		kubernetes:utils:94aeca20bf09:kubernetes_utils/vendor/k8s.io/utils \
+		lestrrat-go:strftime:v1.0.1:lestrrat_go_strftime/vendor/github.com/lestrrat-go/strftime \
+		lxn:walk:02935bac0ab8:lxn_walk/vendor/github.com/lxn/walk \
+		lxn:win:2da648fda5b4:lxn_win/vendor/github.com/lxn/win \
+		magiconair:properties:v1.8.1:magiconair_properties/vendor/github.com/magiconair/properties \
+		mailru:easyjson:b2ccc519800e:mailru_easyjson/vendor/github.com/mailru/easyjson \
+		mattn:go-colorable:v0.1.6:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
+		mdlayher:netlink:v1.1.0:mdlayher_netlink/vendor/github.com/mdlayher/netlink \
+		mholt:archiver:26cf5bb32d07:mholt_archiver/vendor/github.com/mholt/archiver \
+		miekg:dns:v1.1.31:miekg_dns/vendor/github.com/miekg/dns \
+		mitchellh:copystructure:v1.0.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \
+		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
+		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
+		mitchellh:reflectwalk:v1.0.0:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \
+		moby:sys:mountinfo/v0.1.3:moby_sys_mountinfo/vendor/github.com/moby/sys \
+		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
+		modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
+		munnerz:goautoneg:a547fc61f48d:munnerz_goautoneg/vendor/github.com/munnerz/goautoneg \
+		natefinch:lumberjack:v2.0.0:natefinch_lumberjack/vendor/gopkg.in/natefinch/lumberjack.v2 \
+		nwaples:rardecode:v1.1.0:nwaples_rardecode/vendor/github.com/nwaples/rardecode \
+		opencontainers:go-digest:v1.0.0-rc1:opencontainers_go_digest/vendor/github.com/opencontainers/go-digest \
+		opencontainers:image-spec:v1.0.1:opencontainers_image_spec/vendor/github.com/opencontainers/image-spec \
+		opencontainers:runc:6cc515888830:opencontainers_runc/vendor/github.com/opencontainers/runc \
+		opencontainers:runtime-spec:v1.0.2:opencontainers_runtime_spec/vendor/github.com/opencontainers/runtime-spec \
+		openshift:api:32369d4db2ad:openshift_api/vendor/github.com/openshift/api \
+		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
+		pbnjay:strptime:5c05b0d668c9:pbnjay_strptime/vendor/github.com/pbnjay/strptime \
+		pborman:uuid:v1.2.0:pborman_uuid/vendor/github.com/pborman/uuid \
+		pelletier:go-toml:v1.2.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
+		philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \
+		pierrec:lz4:v2.5.0:pierrec_lz4/vendor/github.com/pierrec/lz4 \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
+		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
+		prometheus:client_golang:v0.9.2:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
+		prometheus:common:v0.9.1:prometheus_common/vendor/github.com/prometheus/common \
+		prometheus:procfs:v0.0.6:prometheus_procfs/vendor/github.com/prometheus/procfs \
+		robfig:cron:v3.0.0:robfig_cron_v3/vendor/github.com/robfig/cron/v3 \
+		samuel:go-zookeeper:2cc03de413da:samuel_go_zookeeper/vendor/github.com/samuel/go-zookeeper \
+		shirou:gopsutil:v2.20.3:shirou_gopsutil/vendor/github.com/shirou/gopsutil \
+		shirou:w32:bb4de0191aa4:shirou_w32/vendor/github.com/shirou/w32 \
+		shuLhan:go-bindata:v3.4.0:shulhan_go_bindata/vendor/github.com/shuLhan/go-bindata \
+		sirupsen:logrus:v1.6.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
+		soniah:gosnmp:v1.26.0:soniah_gosnmp/vendor/github.com/soniah/gosnmp \
+		spf13:afero:v1.2.2:spf13_afero/vendor/github.com/spf13/afero \
+		spf13:cobra:v1.0.0:spf13_cobra/vendor/github.com/spf13/cobra \
+		spf13:jwalterweatherman:v1.1.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \
+		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
+		stretchr:objx:v0.2.0:stretchr_objx/vendor/github.com/stretchr/objx \
+		stretchr:testify:v1.5.1:stretchr_testify/vendor/github.com/stretchr/testify \
+		syndtr:gocapability:d98352740cb2:syndtr_gocapability/vendor/github.com/syndtr/gocapability \
+		tedsuo:rata:v1.0.0:tedsuo_rata/vendor/github.com/tedsuo/rata \
+		tinylib:msgp:v1.1.2:tinylib_msgp/vendor/github.com/tinylib/msgp \
+		twmb:murmur3:v1.1.3:twmb_murmur3/vendor/github.com/twmb/murmur3 \
+		uber-go:atomic:v1.6.0:uber_go_atomic/vendor/go.uber.org/atomic \
+		uber-go:multierr:v1.5.0:uber_go_multierr/vendor/go.uber.org/multierr \
+		uber-go:zap:v1.14.1:uber_go_zap/vendor/go.uber.org/zap \
+		ulikunitz:xz:v0.5.7:ulikunitz_xz/vendor/github.com/ulikunitz/xz \
+		urfave:negroni:v1.0.0:urfave_negroni/vendor/github.com/urfave/negroni \
 		vishvananda:netlink:v1.1.0:vishvananda_netlink \
-		vishvananda:netns:0a2b9b5464df:vishvananda_netns/src/github.com/vishvananda/netns \
-		vito:go-sse:v1.0.0:vito_go_sse/src/github.com/vito/go-sse \
-		vmihailenco:msgpack:v4.3.11:vmihailenco_msgpack_v4/src/github.com/vmihailenco/msgpack/v4 \
-		vmihailenco:tagparser:v0.1.1:vmihailenco_tagparser/src/github.com/vmihailenco/tagparser \
-		zorkian:go-datadog-api:v2.29.0:zorkian_go_datadog_api/src/gopkg.in/zorkian/go-datadog-api.v2
+		vishvananda:netns:0a2b9b5464df:vishvananda_netns/vendor/github.com/vishvananda/netns \
+		vito:go-sse:v1.0.0:vito_go_sse/vendor/github.com/vito/go-sse \
+		vmihailenco:msgpack:v4.3.11:vmihailenco_msgpack_v4/vendor/github.com/vmihailenco/msgpack/v4 \
+		vmihailenco:tagparser:v0.1.1:vmihailenco_tagparser/vendor/github.com/vmihailenco/tagparser \
+		zorkian:go-datadog-api:v2.29.0:zorkian_go_datadog_api/vendor/gopkg.in/zorkian/go-datadog-api.v2
 
 USE_RC_SUBR=	${PORTNAME}-process-agent ${PORTNAME}-trace-agent ${PORTNAME}-agent
 
+DATADOG_PREFIX=	${PREFIX}/bin/${PORTNAME}
+LOGDIR=		/var/log/${PORTNAME}
+RUNDIR=		/var/run/${PORTNAME}
+
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
@@ -307,18 +301,20 @@
 ZK_VARS=	agent_build_tags+=zk
 ZLIB_VARS=	agent_build_tags+=zlib
 
-USE_LDCONFIG=	yes
-
 PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
-LD_FLAG_STRING=		-s -X '${GO_PKGNAME}/pkg/version.AgentVersion=${DISTVERSION}' -X '${GO_PKGNAME}/pkg/config.DefaultPython=3'
+GO_TARGET=	./cmd/agent \
+		./cmd/dogstatsd \
+		./cmd/trace-agent \
+		./cmd/process-agent
 
-DATADOG_BINARIES=	agent dogstatsd trace-agent process-agent
+CGO_CFLAGS=	-w -I${WRKSRC}/rtloader/include -I${WRKSRC}/rtloader/common
+CGO_LDFLAGS=	-L${WRKSRC}/rtloader/rtloader
+GO_BUILDFLAGS=	-tags '${AGENT_BUILD_TAGS}' -ldflags="-s -X '${GO_PKGNAME}/pkg/version.AgentVersion=${DISTVERSION}' -X '${GO_PKGNAME}/pkg/config.DefaultPython=3'"
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/vendor/github.com/vishvananda
 	@${RLN} ${WRKSRC_mdlayher_netlink} ${WRKSRC}/vendor/github.com/vishvananda/netlink
-	@${RM} ${WRKSRC}/go.mod
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/datadog-agent|${ETCDIR}|g' \
@@ -348,16 +344,6 @@
 	${GO_CMD} generate ${WRKSRC}/pkg/status/render.go
 	${GO_CMD} generate ${WRKSRC}/cmd/agent/gui/gui.go
 
-do-build:
-# Build go binaries
-.for bin in ${DATADOG_BINARIES}
-	(cd ${WRKSRC}/cmd/${bin}; \
-		${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} \
-		CGO_CFLAGS="-w -I${WRKSRC}/rtloader/include -I${WRKSRC}/rtloader/common" \
-		CGO_LDFLAGS="-L${WRKSRC}/rtloader/rtloader" ${GO_CMD} build -tags \
-		'${AGENT_BUILD_TAGS}' -o ${WRKSRC}/cmd/${bin}/${bin} -ldflags "${LD_FLAG_STRING}")
-.endfor
-
 post-build:
 # Generate config files
 	${SETENV} ${MAKE_ENV} ${BUILD_ENV} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go agent-py3 \
@@ -380,14 +366,14 @@
 .endfor
 
 	# Install binaries
-	${INSTALL_PROGRAM} ${WRKSRC}/cmd/process-agent/process-agent ${STAGEDIR}${DATADOG_PREFIX}/process-agent
-	${INSTALL_PROGRAM} ${WRKSRC}/cmd/trace-agent/trace-agent ${STAGEDIR}${DATADOG_PREFIX}/trace-agent
-	${INSTALL_PROGRAM} ${WRKSRC}/cmd/agent/agent	${STAGEDIR}${DATADOG_PREFIX}/agent
+.for f in agent dogstatsd process-agent trace-agent
+	${INSTALL_PROGRAM} ${WRKDIR}/bin/${f} ${STAGEDIR}${DATADOG_PREFIX}
+.endfor
 	cd ${WRKSRC}/cmd/agent && ${COPYTREE_SHARE} dist ${STAGEDIR}${DATADOG_PREFIX}
 	cd ${WRKSRC}/pkg/status && ${COPYTREE_SHARE} templates ${STAGEDIR}${DATADOG_PREFIX}/dist
 
 	# Install rtloader library
-	cd ${WRKSRC}/rtloader && make -C . ${INSTALL} DESTDIR=${STAGEDIR}
+	make -C ${WRKSRC}/rtloader ${INSTALL} DESTDIR=${STAGEDIR}
 
 post-install:
 	# Install configuration files
Index: sysutils/datadog/distinfo
===================================================================
--- sysutils/datadog/distinfo	(revision 554957)
+++ sysutils/datadog/distinfo	(working copy)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1605050321
-SHA256 (DataDog-datadog-agent-datadog-7.23.1-7.23.1_GH0.tar.gz) = c5af3d3686e691178ae3327ab76cf5269bf0c4a785da6aec27ecff4d854c0af8
-SIZE (DataDog-datadog-agent-datadog-7.23.1-7.23.1_GH0.tar.gz) = 17094861
+TIMESTAMP = 1605194409
+SHA256 (datadog-datadog-agent-datadog-7.23.1-7.23.1_GH0.tar.gz) = c5af3d3686e691178ae3327ab76cf5269bf0c4a785da6aec27ecff4d854c0af8
+SIZE (datadog-datadog-agent-datadog-7.23.1-7.23.1_GH0.tar.gz) = 17094861
 SHA256 (DataDog-agent-payload-v4.44.0_GH0.tar.gz) = 2973cc263df1e2812fc1a2d60a602f52cfe57688c760a3fe97ff4b84a7836105
 SIZE (DataDog-agent-payload-v4.44.0_GH0.tar.gz) = 119685
 SHA256 (DataDog-cast-1ee8c8bd14a3_GH0.tar.gz) = a08d42ae7a184a72e2976ae24cb236aace4938c28042a2de562566f3584845f5
@@ -63,12 +63,14 @@
 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
 SHA256 (bhmj-jsonslice-92c3edaad8e2_GH0.tar.gz) = f705d8b8fd8f34587d4afa7bf805dc46368d9a445d53812781a913d16cb1afaf
 SIZE (bhmj-jsonslice-92c3edaad8e2_GH0.tar.gz) = 31946
-SHA256 (blabber-go-freebsd-sysctl-dcd5a22_GH0.tar.gz) = 3a5bdf29ca9a69d72d4547f1532cc3a5f1f5bf34ef1f5f05f33bde51541a8236
-SIZE (blabber-go-freebsd-sysctl-dcd5a22_GH0.tar.gz) = 1571
+SHA256 (blabber-go-freebsd-sysctl-30a4aca6b547_GH0.tar.gz) = 83ed53715c14218307c38c355c6af1189bdfd511f3551b4f8063e00c1bb8a0d7
+SIZE (blabber-go-freebsd-sysctl-30a4aca6b547_GH0.tar.gz) = 1577
 SHA256 (blang-semver-v3.5.1_GH0.tar.gz) = 3d9da53f4c2d3169bfa9b25f2f36f301a37556a47259c870881524c643c69c57
 SIZE (blang-semver-v3.5.1_GH0.tar.gz) = 14831
 SHA256 (bmizerany-pat-6226ea591a40_GH0.tar.gz) = a6504edb0215f793394b2cd15d6711d760446e7e5964720b0aa7848f66204384
 SIZE (bmizerany-pat-6226ea591a40_GH0.tar.gz) = 6313
+SHA256 (bouk-monkey-v1.0.1_GH0.tar.gz) = acfe015ca7cf23d8e348592443463f7e5a3a8da6a461fda0d02691b6d26ce8f1
+SIZE (bouk-monkey-v1.0.1_GH0.tar.gz) = 4844
 SHA256 (cenkalti-backoff-v2.2.1_GH0.tar.gz) = a2c29d0184e7afc415975cf2689723028d2686ffbb67fe0999ab1d691e6d16db
 SIZE (cenkalti-backoff-v2.2.1_GH0.tar.gz) = 8623
 SHA256 (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 0aa930142b669d7c47e2b8343f6adc9f03414a9c45763c5f746de95231d6ad6d
@@ -117,6 +119,8 @@
 SIZE (dgryski-go-jump-e1f439676b57_GH0.tar.gz) = 1948
 SHA256 (docker-distribution-0ac367fd6bee_GH0.tar.gz) = 4a5a045d497cf9c9a394b22f98d126bda0964107adf46784072b4ef2fcc3c7a6
 SIZE (docker-distribution-0ac367fd6bee_GH0.tar.gz) = 1997156
+SHA256 (moby-moby-v17.12.0-ce_GH0.tar.gz) = cc926e9b420b948556a0b534a642978baded65470be69e598772903185368df6
+SIZE (moby-moby-v17.12.0-ce_GH0.tar.gz) = 7199288
 SHA256 (docker-go-connections-v0.4.0_GH0.tar.gz) = e31dfcf72dd9b07bf6dc320671a78a142a1b7c6287a7282c034c8cd463bc8663
 SIZE (docker-go-connections-v0.4.0_GH0.tar.gz) = 30770
 SHA256 (docker-go-events-e31b211e4f1c_GH0.tar.gz) = 2ed79a03599da09a8a35e955f962fb6b134a9ecadb5686133d4256a1ace5a5b0
@@ -391,8 +395,8 @@
 SIZE (robfig-cron-v3.0.0_GH0.tar.gz) = 25276
 SHA256 (samuel-go-zookeeper-2cc03de413da_GH0.tar.gz) = dac23a1f2a63f6f79f8d2bc30d6a36e9b28b4e15013381b11b102f489505fc53
 SIZE (samuel-go-zookeeper-2cc03de413da_GH0.tar.gz) = 40257
-SHA256 (shirou-gopsutil-d5eecd68_GH0.tar.gz) = 4e7f41465ef6323fa98e1e4aa534d78f0a2b828fa58fe688fe4655907715e7c0
-SIZE (shirou-gopsutil-d5eecd68_GH0.tar.gz) = 138939
+SHA256 (shirou-gopsutil-v2.20.3_GH0.tar.gz) = 57fb3b6d6aa1ba68e0bdf778485eacd2f18814fc62356b4df0ebf7cb8ebcf1ba
+SIZE (shirou-gopsutil-v2.20.3_GH0.tar.gz) = 136318
 SHA256 (shirou-w32-bb4de0191aa4_GH0.tar.gz) = 9392c79053e1137f6e5716d5c3f28a9639c7aed9292a1ca4b8f41fa9202dbba8
 SIZE (shirou-w32-bb4de0191aa4_GH0.tar.gz) = 44336
 SHA256 (shuLhan-go-bindata-v3.4.0_GH0.tar.gz) = f0762bc7b2f8c2a6d6f42ced7f8774efa09bc0a5ef3471fd5d86027fcd796bf3
@@ -403,8 +407,8 @@
 SIZE (soniah-gosnmp-v1.26.0_GH0.tar.gz) = 67923
 SHA256 (spf13-afero-v1.2.2_GH0.tar.gz) = b577afca7e9839aa7cf0ddd712af553aec671b74f97fe0c88c63f911d1020570
 SIZE (spf13-afero-v1.2.2_GH0.tar.gz) = 46157
-SHA256 (spf13-cobra-v0.0.5_GH0.tar.gz) = 79226ce00e2b91306277e679d024eea6d17d0c02fc671555fd25df0c3ea07423
-SIZE (spf13-cobra-v0.0.5_GH0.tar.gz) = 111126
+SHA256 (spf13-cobra-v1.0.0_GH0.tar.gz) = 58dbfe1b4dbc6751575e94d1e62d073098e0b41790bc1c7a7a95ec6b870ac697
+SIZE (spf13-cobra-v1.0.0_GH0.tar.gz) = 128897
 SHA256 (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 4fd850a792c5738954c4801cf549d8d0bf53edd17139cd39d179aa5abf7ec68d
 SIZE (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 6871
 SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
Index: sysutils/datadog/files/patch-rtloader_rtloader_api.cpp
===================================================================
--- sysutils/datadog/files/patch-rtloader_rtloader_api.cpp	(revision 554957)
+++ sysutils/datadog/files/patch-rtloader_rtloader_api.cpp	(working copy)
@@ -1,6 +1,6 @@
---- rtloader/rtloader/api.cpp.orig	2020-05-11 15:38:36 UTC
+--- rtloader/rtloader/api.cpp.orig	2020-10-20 15:22:28 UTC
 +++ rtloader/rtloader/api.cpp
-@@ -25,6 +25,9 @@
+@@ -39,6 +39,9 @@
  #elif _WIN32
  #    define DATADOG_AGENT_TWO "libdatadog-agent-two.dll"
  #    define DATADOG_AGENT_THREE "libdatadog-agent-three.dll"
Index: sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_disk_disk__freebsd.go
===================================================================
--- sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_disk_disk__freebsd.go	(nonexistent)
+++ sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_disk_disk__freebsd.go	(working copy)
@@ -0,0 +1,24 @@
+https://github.com/shirou/gopsutil/pull/895
+
+--- vendor/github.com/DataDog/gopsutil/disk/disk_freebsd.go.orig	2020-11-12 15:36:44 UTC
++++ vendor/github.com/DataDog/gopsutil/disk/disk_freebsd.go
+@@ -77,9 +77,9 @@ func Partitions(all bool) ([]PartitionStat, error) {
+ 		}
+ 
+ 		d := PartitionStat{
+-			Device:     common.IntToString(stat.Mntfromname[:]),
+-			Mountpoint: common.IntToString(stat.Mntonname[:]),
+-			Fstype:     common.IntToString(stat.Fstypename[:]),
++			Device:     common.ByteToString(stat.Mntfromname[:]),
++			Mountpoint: common.ByteToString(stat.Mntonname[:]),
++			Fstype:     common.ByteToString(stat.Fstypename[:]),
+ 			Opts:       opts,
+ 		}
+ 		if all == false {
+@@ -172,5 +172,5 @@ func parseDevstat(buf []byte) (Devstat, error) {
+ }
+ 
+ func getFsType(stat syscall.Statfs_t) string {
+-	return common.IntToString(stat.Fstypename[:])
++	return common.ByteToString(stat.Fstypename[:])
+ }

Property changes on: sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_disk_disk__freebsd.go
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_host_host__freebsd__arm.go
===================================================================
--- sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_host_host__freebsd__arm.go	(nonexistent)
+++ sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_host_host__freebsd__arm.go	(working copy)
@@ -0,0 +1,45 @@
+--- vendor/github.com/DataDog/gopsutil/host/host_freebsd_arm.go.orig	2020-11-12 17:05:21 UTC
++++ vendor/github.com/DataDog/gopsutil/host/host_freebsd_arm.go
+@@ -0,0 +1,42 @@
++// Code generated by cmd/cgo -godefs; DO NOT EDIT.
++// cgo -godefs types_freebsd.go
++
++package host
++
++const (
++	sizeofPtr      = 0x4
++	sizeofShort    = 0x2
++	sizeofInt      = 0x4
++	sizeofLong     = 0x8
++	sizeofLongLong = 0x8
++	sizeOfUtmpx    = 0xc5
++)
++
++type (
++	_C_short     int16
++	_C_int       int32
++	_C_long      int32
++	_C_long_long int64
++)
++
++type Utmp struct {
++	Line [8]int8
++	Name [16]int8
++	Host [16]int8
++	Time int32
++}
++
++type Utmpx struct {
++	Type uint8
++	Tv   Timeval
++	Id   [8]int8
++	Pid  uint32
++	User [32]int8
++	Line [16]int8
++	Host [128]int8
++}
++
++type Timeval struct {
++	Sec  [4]byte
++	Usec [3]byte
++}

Property changes on: sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_host_host__freebsd__arm.go
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_host_host__freebsd__arm64.go
===================================================================
--- sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_host_host__freebsd__arm64.go	(nonexistent)
+++ sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_host_host__freebsd__arm64.go	(working copy)
@@ -0,0 +1,47 @@
+--- vendor/github.com/DataDog/gopsutil/host/host_freebsd_arm64.go.orig	2020-11-12 17:05:21 UTC
++++ vendor/github.com/DataDog/gopsutil/host/host_freebsd_arm64.go
+@@ -0,0 +1,44 @@
++// +build freebsd
++// +build arm64
++// Code generated by cmd/cgo -godefs; DO NOT EDIT.
++// cgo -godefs host/types_freebsd.go
++
++package host
++
++const (
++	sizeofPtr	= 0x8
++	sizeofShort	= 0x2
++	sizeofInt	= 0x4
++	sizeofLong	= 0x8
++	sizeofLongLong	= 0x8
++	sizeOfUtmpx	= 0xc5
++)
++
++type (
++	_C_short	int16
++	_C_int		int32
++	_C_long		int64
++	_C_long_long	int64
++)
++
++type Utmp struct {
++	Line [8]int8
++	Name [16]int8
++	Host [16]int8
++	Time int32
++}
++
++type Utmpx struct {
++	Type uint8
++	Tv   Timeval
++	Id   [8]int8
++	Pid  uint32
++	User [32]int8
++	Line [16]int8
++	Host [128]int8
++}
++
++type Timeval struct {
++	Sec  [4]byte
++	Usec [3]byte
++}

Property changes on: sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_host_host__freebsd__arm64.go
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_process_process__freebsd__arm.go
===================================================================
--- sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_process_process__freebsd__arm.go	(nonexistent)
+++ sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_process_process__freebsd__arm.go	(working copy)
@@ -0,0 +1,195 @@
+--- vendor/github.com/DataDog/gopsutil/process/process_freebsd_arm.go.orig	2020-11-12 17:05:21 UTC
++++ vendor/github.com/DataDog/gopsutil/process/process_freebsd_arm.go
+@@ -0,0 +1,192 @@
++// Created by cgo -godefs - DO NOT EDIT
++// cgo -godefs types_freebsd.go
++
++package process
++
++const (
++	CTLKern          = 1
++	KernProc         = 14
++	KernProcPID      = 1
++	KernProcProc     = 8
++	KernProcPathname = 12
++	KernProcArgs     = 7
++)
++
++const (
++	sizeofPtr      = 0x4
++	sizeofShort    = 0x2
++	sizeofInt      = 0x4
++	sizeofLong     = 0x4
++	sizeofLongLong = 0x8
++)
++
++const (
++	sizeOfKinfoVmentry = 0x488
++	sizeOfKinfoProc    = 0x440
++)
++
++const (
++	SIDL   = 1
++	SRUN   = 2
++	SSLEEP = 3
++	SSTOP  = 4
++	SZOMB  = 5
++	SWAIT  = 6
++	SLOCK  = 7
++)
++
++type (
++	_C_short     int16
++	_C_int       int32
++	_C_long      int32
++	_C_long_long int64
++)
++
++type Timespec struct {
++	Sec  int64
++	Nsec int64
++}
++
++type Timeval struct {
++	Sec  int64
++	Usec int64
++}
++
++type Rusage struct {
++	Utime    Timeval
++	Stime    Timeval
++	Maxrss   int32
++	Ixrss    int32
++	Idrss    int32
++	Isrss    int32
++	Minflt   int32
++	Majflt   int32
++	Nswap    int32
++	Inblock  int32
++	Oublock  int32
++	Msgsnd   int32
++	Msgrcv   int32
++	Nsignals int32
++	Nvcsw    int32
++	Nivcsw   int32
++}
++
++type Rlimit struct {
++	Cur int32
++	Max int32
++}
++
++type KinfoProc struct {
++	Structsize   int32
++	Layout       int32
++	Args         int32 /* pargs */
++	Paddr        int32 /* proc */
++	Addr         int32 /* user */
++	Tracep       int32 /* vnode */
++	Textvp       int32 /* vnode */
++	Fd           int32 /* filedesc */
++	Vmspace      int32 /* vmspace */
++	Wchan        int32
++	Pid          int32
++	Ppid         int32
++	Pgid         int32
++	Tpgid        int32
++	Sid          int32
++	Tsid         int32
++	Jobc         int16
++	Spare_short1 int16
++	Tdev         uint32
++	Siglist      [16]byte /* sigset */
++	Sigmask      [16]byte /* sigset */
++	Sigignore    [16]byte /* sigset */
++	Sigcatch     [16]byte /* sigset */
++	Uid          uint32
++	Ruid         uint32
++	Svuid        uint32
++	Rgid         uint32
++	Svgid        uint32
++	Ngroups      int16
++	Spare_short2 int16
++	Groups       [16]uint32
++	Size         uint32
++	Rssize       int32
++	Swrss        int32
++	Tsize        int32
++	Dsize        int32
++	Ssize        int32
++	Xstat        uint16
++	Acflag       uint16
++	Pctcpu       uint32
++	Estcpu       uint32
++	Slptime      uint32
++	Swtime       uint32
++	Cow          uint32
++	Runtime      uint64
++	Start        Timeval
++	Childtime    Timeval
++	Flag         int32
++	Kiflag       int32
++	Traceflag    int32
++	Stat         int8
++	Nice         int8
++	Lock         int8
++	Rqindex      int8
++	Oncpu        uint8
++	Lastcpu      uint8
++	Tdname       [17]int8
++	Wmesg        [9]int8
++	Login        [18]int8
++	Lockname     [9]int8
++	Comm         [20]int8
++	Emul         [17]int8
++	Loginclass   [18]int8
++	Sparestrings [50]int8
++	Spareints    [4]int32
++	Flag2        int32
++	Fibnum       int32
++	Cr_flags     uint32
++	Jid          int32
++	Numthreads   int32
++	Tid          int32
++	Pri          Priority
++	Rusage       Rusage
++	Rusage_ch    Rusage
++	Pcb          int32 /* pcb */
++	Kstack       int32
++	Udata        int32
++	Tdaddr       int32 /* thread */
++	Spareptrs    [6]int64
++	Sparelongs   [12]int64
++	Sflag        int64
++	Tdflags      int64
++}
++
++type Priority struct {
++	Class  uint8
++	Level  uint8
++	Native uint8
++	User   uint8
++}
++
++type KinfoVmentry struct {
++	Structsize       int32
++	Type             int32
++	Start            uint64
++	End              uint64
++	Offset           uint64
++	Vn_fileid        uint64
++	Vn_fsid          uint32
++	Flags            int32
++	Resident         int32
++	Private_resident int32
++	Protection       int32
++	Ref_count        int32
++	Shadow_count     int32
++	Vn_type          int32
++	Vn_size          uint64
++	Vn_rdev          uint32
++	Vn_mode          uint16
++	Status           uint16
++	X_kve_ispare     [12]int32
++	Path             [1024]int8
++}

Property changes on: sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_process_process__freebsd__arm.go
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_process_process__freebsd__arm64.go
===================================================================
--- sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_process_process__freebsd__arm64.go	(nonexistent)
+++ sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_process_process__freebsd__arm64.go	(working copy)
@@ -0,0 +1,204 @@
+--- vendor/github.com/DataDog/gopsutil/process/process_freebsd_arm64.go.orig	2020-11-12 17:05:21 UTC
++++ vendor/github.com/DataDog/gopsutil/process/process_freebsd_arm64.go
+@@ -0,0 +1,201 @@
++// +build freebsd
++// +build arm64
++// Code generated by cmd/cgo -godefs; DO NOT EDIT.
++// cgo -godefs process/types_freebsd.go
++
++package process
++
++const (
++	CTLKern			= 1
++	KernProc		= 14
++	KernProcPID		= 1
++	KernProcProc		= 8
++	KernProcPathname	= 12
++	KernProcArgs		= 7
++)
++
++const (
++	sizeofPtr	= 0x8
++	sizeofShort	= 0x2
++	sizeofInt	= 0x4
++	sizeofLong	= 0x8
++	sizeofLongLong	= 0x8
++)
++
++const (
++	sizeOfKinfoVmentry	= 0x488
++	sizeOfKinfoProc		= 0x440
++)
++
++const (
++	SIDL	= 1
++	SRUN	= 2
++	SSLEEP	= 3
++	SSTOP	= 4
++	SZOMB	= 5
++	SWAIT	= 6
++	SLOCK	= 7
++)
++
++type (
++	_C_short	int16
++	_C_int		int32
++	_C_long		int64
++	_C_long_long	int64
++)
++
++type Timespec struct {
++	Sec	int64
++	Nsec	int64
++}
++
++type Timeval struct {
++	Sec	int64
++	Usec	int64
++}
++
++type Rusage struct {
++	Utime		Timeval
++	Stime		Timeval
++	Maxrss		int64
++	Ixrss		int64
++	Idrss		int64
++	Isrss		int64
++	Minflt		int64
++	Majflt		int64
++	Nswap		int64
++	Inblock		int64
++	Oublock		int64
++	Msgsnd		int64
++	Msgrcv		int64
++	Nsignals	int64
++	Nvcsw		int64
++	Nivcsw		int64
++}
++
++type Rlimit struct {
++	Cur	int64
++	Max	int64
++}
++
++type KinfoProc struct {
++	Structsize	int32
++	Layout		int32
++	Args		*int64 /* pargs */
++	Paddr		*int64 /* proc */
++	Addr		*int64 /* user */
++	Tracep		*int64 /* vnode */
++	Textvp		*int64 /* vnode */
++	Fd		*int64 /* filedesc */
++	Vmspace		*int64 /* vmspace */
++	Wchan		*byte
++	Pid		int32
++	Ppid		int32
++	Pgid		int32
++	Tpgid		int32
++	Sid		int32
++	Tsid		int32
++	Jobc		int16
++	Spare_short1	int16
++	Tdev_freebsd11	uint32
++	Siglist		[16]byte /* sigset */
++	Sigmask		[16]byte /* sigset */
++	Sigignore	[16]byte /* sigset */
++	Sigcatch	[16]byte /* sigset */
++	Uid		uint32
++	Ruid		uint32
++	Svuid		uint32
++	Rgid		uint32
++	Svgid		uint32
++	Ngroups		int16
++	Spare_short2	int16
++	Groups		[16]uint32
++	Size		uint64
++	Rssize		int64
++	Swrss		int64
++	Tsize		int64
++	Dsize		int64
++	Ssize		int64
++	Xstat		uint16
++	Acflag		uint16
++	Pctcpu		uint32
++	Estcpu		uint32
++	Slptime		uint32
++	Swtime		uint32
++	Cow		uint32
++	Runtime		uint64
++	Start		Timeval
++	Childtime	Timeval
++	Flag		int64
++	Kiflag		int64
++	Traceflag	int32
++	Stat		uint8
++	Nice		int8
++	Lock		uint8
++	Rqindex		uint8
++	Oncpu_old	uint8
++	Lastcpu_old	uint8
++	Tdname		[17]uint8
++	Wmesg		[9]uint8
++	Login		[18]uint8
++	Lockname	[9]uint8
++	Comm		[20]int8
++	Emul		[17]uint8
++	Loginclass	[18]uint8
++	Moretdname	[4]uint8
++	Sparestrings	[46]uint8
++	Spareints	[2]int32
++	Tdev		uint64
++	Oncpu		int32
++	Lastcpu		int32
++	Tracer		int32
++	Flag2		int32
++	Fibnum		int32
++	Cr_flags	uint32
++	Jid		int32
++	Numthreads	int32
++	Tid		int32
++	Pri		Priority
++	Rusage		Rusage
++	Rusage_ch	Rusage
++	Pcb		*int64 /* pcb */
++	Kstack		*byte
++	Udata		*byte
++	Tdaddr		*int64 /* thread */
++	Spareptrs	[6]*byte
++	Sparelongs	[12]int64
++	Sflag		int64
++	Tdflags		int64
++}
++
++type Priority struct {
++	Class	uint8
++	Level	uint8
++	Native	uint8
++	User	uint8
++}
++
++type KinfoVmentry struct {
++	Structsize		int32
++	Type			int32
++	Start			uint64
++	End			uint64
++	Offset			uint64
++	Vn_fileid		uint64
++	Vn_fsid_freebsd11	uint32
++	Flags			int32
++	Resident		int32
++	Private_resident	int32
++	Protection		int32
++	Ref_count		int32
++	Shadow_count		int32
++	Vn_type			int32
++	Vn_size			uint64
++	Vn_rdev_freebsd11	uint32
++	Vn_mode			uint16
++	Status			uint16
++	Vn_fsid			uint64
++	Vn_rdev			uint64
++	X_kve_ispare		[8]int32
++	Path			[1024]uint8
++}

Property changes on: sysutils/datadog/files/patch-vendor_github.com_DataDog_gopsutil_process_process__freebsd__arm64.go
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: sysutils/datadog/files/patch-vendor_github.com_shirou_gopsutil_disk_disk__freebsd.go
===================================================================
--- sysutils/datadog/files/patch-vendor_github.com_shirou_gopsutil_disk_disk__freebsd.go	(nonexistent)
+++ sysutils/datadog/files/patch-vendor_github.com_shirou_gopsutil_disk_disk__freebsd.go	(working copy)
@@ -0,0 +1,22 @@
+--- vendor/github.com/shirou/gopsutil/disk/disk_freebsd.go.orig	2020-03-14 14:36:25 UTC
++++ vendor/github.com/shirou/gopsutil/disk/disk_freebsd.go
+@@ -84,9 +84,9 @@ func PartitionsWithContext(ctx context.Context, all bo
+ 		}
+ 
+ 		d := PartitionStat{
+-			Device:     common.IntToString(stat.Mntfromname[:]),
+-			Mountpoint: common.IntToString(stat.Mntonname[:]),
+-			Fstype:     common.IntToString(stat.Fstypename[:]),
++			Device:     common.ByteToString(stat.Mntfromname[:]),
++			Mountpoint: common.ByteToString(stat.Mntonname[:]),
++			Fstype:     common.ByteToString(stat.Fstypename[:]),
+ 			Opts:       opts,
+ 		}
+ 		if all == false {
+@@ -170,5 +170,5 @@ func parseDevstat(buf []byte) (Devstat, error) {
+ }
+ 
+ func getFsType(stat unix.Statfs_t) string {
+-	return common.IntToString(stat.Fstypename[:])
++	return common.ByteToString(stat.Fstypename[:])
+ }

Property changes on: sysutils/datadog/files/patch-vendor_github.com_shirou_gopsutil_disk_disk__freebsd.go
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: sysutils/datadog/pkg-plist
===================================================================
--- sysutils/datadog/pkg-plist	(revision 554957)
+++ sysutils/datadog/pkg-plist	(working copy)
@@ -8,6 +8,7 @@
 @dir(%%USER%%,%%GROUP%%,0750) %%RUNDIR%%
 @sample(%%USER%%,%%GROUP%%,640) %%ETCDIR%%/%%PORTNAME%%.yaml.example
 bin/%%PORTNAME%%/agent
+bin/%%PORTNAME%%/dogstatsd
 bin/%%PORTNAME%%/dist/%%PORTNAME%%.yaml
 bin/%%PORTNAME%%/dist/checks/__init__.py
 bin/%%PORTNAME%%/dist/checks/libs/__init__.py