Index: head/sysutils/nomad/Makefile =================================================================== --- head/sysutils/nomad/Makefile (revision 561921) +++ head/sysutils/nomad/Makefile (revision 561922) @@ -1,34 +1,31 @@ # $FreeBSD$ PORTNAME= nomad DISTVERSIONPREFIX= v -DISTVERSION= 0.12.9 +DISTVERSION= 1.0.1 CATEGORIES= sysutils MAINTAINER= jhixson@FreeBSD.org 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 GH_SUBDIR= src/github.com/hashicorp/nomad USE_RC_SUBR= nomad GO_BUILDFLAGS= -tags ui \ -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" USERS= nomad GROUPS= nomad post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/nomad ${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 Index: head/sysutils/nomad/distinfo =================================================================== --- head/sysutils/nomad/distinfo (revision 561921) +++ head/sysutils/nomad/distinfo (revision 561922) @@ -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 Index: head/sysutils/nomad/files/patch-vendor_github.com_shirou_gopsutil_disk_disk__freebsd.go =================================================================== --- head/sysutils/nomad/files/patch-vendor_github.com_shirou_gopsutil_disk_disk__freebsd.go (revision 561921) +++ head/sysutils/nomad/files/patch-vendor_github.com_shirou_gopsutil_disk_disk__freebsd.go (nonexistent) @@ -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[:]) - } Property changes on: head/sysutils/nomad/files/patch-vendor_github.com_shirou_gopsutil_disk_disk__freebsd.go ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/nomad/files/nomad.in =================================================================== --- head/sysutils/nomad/files/nomad.in (revision 561921) +++ head/sysutils/nomad/files/nomad.in (revision 561922) @@ -1,61 +1,62 @@ #!/bin/sh # $FreeBSD: head/sysutils/nomad/files/nomad.in 386655 2015-05-18 02:05:03Z swills $ # # PROVIDE: nomad # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # nomad_enable (bool): Set to NO by default. # Set it to YES to enable nomad. # nomad_debug (bool): Set to NO by default. # Set it to YES to enable nomad debugging to syslog. # nomad_user (user): Set user to run nomad. # Default is "nomad". # nomad_group (group): Set group to run nomad. # Default is "nomad". # nomad_dir (dir): Set dir to run nomad in. # Default is "/var/tmp/nomad". # nomad_env (dir): Set environment variables used with nomad # Default is "". . /etc/rc.subr name=nomad rcvar=nomad_enable load_rc_config $name : ${nomad_enable:="NO"} : ${nomad_debug:="NO"} : ${nomad_user:="nomad"} : ${nomad_group:="nomad"} : ${nomad_dir:="/var/tmp/nomad"} : ${nomad_env:=""} 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}" start_precmd=nomad_startprecmd nomad_startprecmd() { if [ ! -e ${pidfile} ]; then install -o ${nomad_user} -g ${nomad_group} /dev/null ${pidfile}; fi if [ ! -d ${nomad_dir} ]; then install -d -o ${nomad_user} -g ${nomad_group} ${nomad_dir} fi if [ "${nomad_debug}" != "NO" ]; then command_args="-T ${name} ${command_args}" fi } run_rc_command "$1"