Fix build on aarch64

Also fix spelling so the telegraf_confdir parameter actually works.

Submitted by:	Mikael Urankar
PR:		244173

3 files changed, 14 insertions, 12 deletions

diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index 5cf26208c459..e5b6c1f8853a 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	telegraf
 DISTVERSION=	1.13.4
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	girgen@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT=	Time-series data collection
 
 LICENSE=	MIT
 
-ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386
+ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386
 
 USES=		go
 
@@ -126,7 +127,7 @@ GH_TUPLE=	GoogleCloudPlatform:google-cloud-go:v0.27.0:go/vendor/cloud.google.com
 		safchain:ethtool:f459e2d:ethtool/vendor/github.com/safchain/ethtool \
 		samuel:go-zookeeper:c4fab1a:go_zookeeper/vendor/github.com/samuel/go-zookeeper \
 		satori:go.uuid:b2ce238:go0uuid/vendor/github.com/satori/go.uuid \
-		shirou:gopsutil:v2.19.11:gopsutil/vendor/github.com/shirou/gopsutil \
+		shirou:gopsutil:v2.20.1:gopsutil/vendor/github.com/shirou/gopsutil \
 		shirou:w32:bb4de01:w32/vendor/github.com/shirou/w32 \
 		sirupsen:logrus:v1.0.5:logrus/vendor/github.com/sirupsen/logrus \
 		soniah:gosnmp:v1.22.0:gosnmp/vendor/github.com/soniah/gosnmp \
@@ -146,10 +147,10 @@ GH_TUPLE=	GoogleCloudPlatform:google-cloud-go:v0.27.0:go/vendor/cloud.google.com
 		yuin:gopher-lua:46796da:gopher_lua/vendor/github.com/yuin/gopher-lua \
 		census-instrumentation:opencensus-go:v0.17.0:opencensus_go/vendor/go.opencensus.io \
 		golang:crypto:87dc89f:crypto/vendor/golang.org/x/crypto \
-		golang:net:a680a1e:net/vendor/golang.org/x/net \
+		golang:net:83d349e:net/vendor/golang.org/x/net \
 		golang:oauth2:d2e6202:oauth2/vendor/golang.org/x/oauth2 \
 		golang:sync:42b3178:sync/vendor/golang.org/x/sync \
-		golang:sys:51ab0e2:sys/vendor/golang.org/x/sys \
+		golang:sys:fead790:sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.0:text/vendor/golang.org/x/text \
 		googleapis:google-api-go-client:19ff876:googleapis/vendor/google.golang.org/api \
 		golang:appengine:v1.1.0:appengine/vendor/google.golang.org/appengine \
@@ -192,7 +193,8 @@ TELEGRAF_LOGDIR=/var/log/${PORTNAME}
 post-patch:
 	${CP} ${WRKSRC_gopsutil}/disk/disk_freebsd_386.go ${WRKSRC_gopsutil}/disk/disk_freebsd_arm.go
 	${CP} ${WRKSRC_gopsutil}/cpu/cpu_freebsd_386.go ${WRKSRC_gopsutil}/cpu/cpu_freebsd_arm.go
-#	${LN} -s . ${WRKSRC_go_syslog}/v2
+	${RM} -r ${SRKSRC}/vendor/github.com/miekg/dns/vendor/golang.org/x/net
+	${CP} -R ${WRKDIR}/net-83d349e/* ${WRKSRC}/vendor/github.com/miekg/dns/vendor/golang.org/x/net
 
 post-install:
 	${MKDIR} ${STAGEDIR}${TELEGRAF_LOGDIR}
diff --git a/net-mgmt/telegraf/distinfo b/net-mgmt/telegraf/distinfo
index 08eef9fc75db..475f90dda68d 100644
--- a/net-mgmt/telegraf/distinfo
+++ b/net-mgmt/telegraf/distinfo
@@ -213,8 +213,8 @@ SHA256 (samuel-go-zookeeper-c4fab1a_GH0.tar.gz) = 697f6f4c4582390ca9af11a764764c
 SIZE (samuel-go-zookeeper-c4fab1a_GH0.tar.gz) = 37079
 SHA256 (satori-go.uuid-b2ce238_GH0.tar.gz) = d361a5114c74a554342c9ea8a65e1c70a4069d8d99719a764c64e142feb89646
 SIZE (satori-go.uuid-b2ce238_GH0.tar.gz) = 8830
-SHA256 (shirou-gopsutil-v2.19.11_GH0.tar.gz) = 6eb8b8da8e8b8661250c7f782b625ce35e98f029d19349c8b6e586b4216c8545
-SIZE (shirou-gopsutil-v2.19.11_GH0.tar.gz) = 132311
+SHA256 (shirou-gopsutil-v2.20.1_GH0.tar.gz) = f2afad4c7b4be33bafb78e577fd90dfbf46a63eafad480623aead5dd73eec315
+SIZE (shirou-gopsutil-v2.20.1_GH0.tar.gz) = 133895
 SHA256 (shirou-w32-bb4de01_GH0.tar.gz) = dd6f44bbfaee59b815a2f1699bf8b49c9385c1a926bf25c3a71e18ca129063a1
 SIZE (shirou-w32-bb4de01_GH0.tar.gz) = 44331
 SHA256 (sirupsen-logrus-v1.0.5_GH0.tar.gz) = 0c422c0f06eb8a67a7c3ce6814d92b866e47b88ad33948c6c009f48ccfbe935f
@@ -253,14 +253,14 @@ SHA256 (census-instrumentation-opencensus-go-v0.17.0_GH0.tar.gz) = 6861fb2e77375
 SIZE (census-instrumentation-opencensus-go-v0.17.0_GH0.tar.gz) = 188072
 SHA256 (golang-crypto-87dc89f_GH0.tar.gz) = bdbfe192638aadbd63ff15da65cf98585866f1386fb2dfc99100f1b6f66c375a
 SIZE (golang-crypto-87dc89f_GH0.tar.gz) = 1709132
-SHA256 (golang-net-a680a1e_GH0.tar.gz) = 719c3242af47fce2893f8d31fc9b53204bc00048f35990e56f1513d8db6fbf1b
-SIZE (golang-net-a680a1e_GH0.tar.gz) = 963677
+SHA256 (golang-net-83d349e_GH0.tar.gz) = a31afa05913ac0ba4da4781aebb543b6058f81829aad8bbaf7b1db1dc730e385
+SIZE (golang-net-83d349e_GH0.tar.gz) = 1103159
 SHA256 (golang-oauth2-d2e6202_GH0.tar.gz) = ded5a113fec2b5df98d3f8ee2ba6232f898eeabfe613b361feaaaea480afb116
 SIZE (golang-oauth2-d2e6202_GH0.tar.gz) = 43160
 SHA256 (golang-sync-42b3178_GH0.tar.gz) = 40b7eda6a898f92a90ebc6b9065c04df9f05ac228493f5f39396477c4947a81c
 SIZE (golang-sync-42b3178_GH0.tar.gz) = 16240
-SHA256 (golang-sys-51ab0e2_GH0.tar.gz) = dc0fffb69ff5a4e83b3bf3d4817b8cacfa85f36ab93855030e3ce8937cc89b88
-SIZE (golang-sys-51ab0e2_GH0.tar.gz) = 1454786
+SHA256 (golang-sys-fead790_GH0.tar.gz) = 51d846bbb6882366a7f2b3e9e90cc4bdbc011897bfda603011c97d00d37b0864
+SIZE (golang-sys-fead790_GH0.tar.gz) = 1257990
 SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
 SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
 SHA256 (googleapis-google-api-go-client-19ff876_GH0.tar.gz) = ea16dd94ce72ae1a3418a4bd7a1c0d191739d624e37a9381b1e27a2a0dd974cc
diff --git a/net-mgmt/telegraf/files/telegraf.in b/net-mgmt/telegraf/files/telegraf.in
index 74aaedc52dc1..e13ca0ee9573 100644
--- a/net-mgmt/telegraf/files/telegraf.in
+++ b/net-mgmt/telegraf/files/telegraf.in
@@ -35,7 +35,7 @@ load_rc_config $name
 : ${telegraf_group:="%%TELEGRAF_GROUP%%"}
 : ${telegraf_flags:="--quiet"}
 : ${telegraf_conf:="%%PREFIX%%/etc/${name}.conf"}
-: ${telegraph_confdir:=""}
+: ${telegraf_confdir:=""}
 : ${telegraf_options:="${telegraf_flags} --config=${telegraf_conf}"}
 
 if [ -n "${telegraf_confdir}" ]; then