aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Davis <brd@FreeBSD.org>2021-01-18 15:44:43 +0000
committerBrad Davis <brd@FreeBSD.org>2021-01-18 15:44:43 +0000
commit1c24e05c945db8d99eeda958c077eb710a71070c (patch)
treebe1be764829e167f5a4ebb8dce2dc1a9842f252a
parent07228913c66b21d6ae7cf9d9f7d72674e890aac9 (diff)
downloadports-1c24e05c945db8d99eeda958c077eb710a71070c.tar.gz
ports-1c24e05c945db8d99eeda958c077eb710a71070c.zip
Notes
-rw-r--r--sysutils/nomad/Makefile5
-rw-r--r--sysutils/nomad/distinfo6
-rw-r--r--sysutils/nomad/files/nomad.in1
-rw-r--r--sysutils/nomad/files/patch-vendor_github.com_shirou_gopsutil_disk_disk__freebsd.go22
4 files changed, 5 insertions, 29 deletions
diff --git a/sysutils/nomad/Makefile b/sysutils/nomad/Makefile
index 12ac16d0c02b..d904e21acecf 100644
--- a/sysutils/nomad/Makefile
+++ b/sysutils/nomad/Makefile
@@ -2,7 +2,7 @@
PORTNAME= nomad
DISTVERSIONPREFIX= v
-DISTVERSION= 0.12.9
+DISTVERSION= 1.0.1
CATEGORIES= sysutils
MAINTAINER= jhixson@FreeBSD.org
@@ -11,9 +11,6 @@ COMMENT= Cluster manager and scheduler
LICENSE= MPL20
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= go
USE_GITHUB= yes
GH_ACCOUNT= hashicorp
diff --git a/sysutils/nomad/distinfo b/sysutils/nomad/distinfo
index 7189052acc4c..dcf26a38aa3c 100644
--- a/sysutils/nomad/distinfo
+++ b/sysutils/nomad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1606423825
-SHA256 (hashicorp-nomad-v0.12.9_GH0.tar.gz) = 22616dcb3e254a14a367bce1090edbebcd1155424b9b5097816f6584f1260e7d
-SIZE (hashicorp-nomad-v0.12.9_GH0.tar.gz) = 51467264
+TIMESTAMP = 1609605846
+SHA256 (hashicorp-nomad-v1.0.1_GH0.tar.gz) = 1dca9ebb1636fc8ef005d9c6eed8cf10fbfc3d7c9ff7307606454142d858f419
+SIZE (hashicorp-nomad-v1.0.1_GH0.tar.gz) = 51101330
diff --git a/sysutils/nomad/files/nomad.in b/sysutils/nomad/files/nomad.in
index 16e8aa882c1f..aaffa5236d83 100644
--- a/sysutils/nomad/files/nomad.in
+++ b/sysutils/nomad/files/nomad.in
@@ -39,6 +39,7 @@ load_rc_config $name
pidfile=/var/run/nomad.pid
procname="%%PREFIX%%/bin/nomad"
command="/usr/sbin/daemon"
+extra_commands="reload"
nomad_command="/usr/bin/env ${nomad_env} ${procname} agent -data-dir=${nomad_dir} ${nomad_args}"
command_args="-f -t ${name} -p ${pidfile} ${nomad_command}"
diff --git a/sysutils/nomad/files/patch-vendor_github.com_shirou_gopsutil_disk_disk__freebsd.go b/sysutils/nomad/files/patch-vendor_github.com_shirou_gopsutil_disk_disk__freebsd.go
deleted file mode 100644
index 990d768d9fbe..000000000000
--- a/sysutils/nomad/files/patch-vendor_github.com_shirou_gopsutil_disk_disk__freebsd.go
+++ /dev/null
@@ -1,22 +0,0 @@
---- vendor/github.com/shirou/gopsutil/disk/disk_freebsd.go.orig 2020-05-14 21:25:30 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[:])
- }