Index: head/sysutils/consul/Makefile =================================================================== --- head/sysutils/consul/Makefile (revision 568217) +++ head/sysutils/consul/Makefile (revision 568218) @@ -1,46 +1,46 @@ # $FreeBSD$ PORTNAME= consul -PORTVERSION= 1.9.3 +PORTVERSION= 1.9.4 DISTVERSIONPREFIX= v CATEGORIES= sysutils MAINTAINER= swills@FreeBSD.org COMMENT= Service discovery and configuration made easy LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules USE_GITHUB= yes GH_ACCOUNT= hashicorp GO_BUILDFLAGS= -ldflags=" \ -X github.com/hashicorp/consul/version.Version=${PORTVERSION} \ -X github.com/hashicorp/consul/version.VersionPrerelease= \ -X github.com/hashicorp/consul/version.GitDescribe=v${PORTVERSION} \ " USE_RC_SUBR= consul PLIST_FILES= bin/consul ETCDIR= ${PREFIX}/etc/${PORTNAME}.d CONSUL_USER?= consul CONSUL_GROUP?= consul CONSUL_DBDIR?= /var/db/${PORTNAME} USERS= ${CONSUL_USER} GROUPS= ${CONSUL_GROUP} SUB_LIST= CONSUL_DBDIR=${CONSUL_DBDIR} \ GROUP=${CONSUL_GROUP} \ USER=${CONSUL_USER} post-extract: ${MKDIR} ${WRKSRC}/vendor/github.com/${GH_ACCOUNT}/${PORTNAME} ${LN} -s ${WRKSRC}/api ${WRKSRC}/vendor/github.com/${GH_ACCOUNT}/${PORTNAME}/api ${LN} -s ${WRKSRC}/sdk ${WRKSRC}/vendor/github.com/${GH_ACCOUNT}/${PORTNAME}/sdk .include Index: head/sysutils/consul/distinfo =================================================================== --- head/sysutils/consul/distinfo (revision 568217) +++ head/sysutils/consul/distinfo (revision 568218) @@ -1,3 +1,3 @@ -TIMESTAMP = 1612488701 -SHA256 (hashicorp-consul-v1.9.3_GH0.tar.gz) = 0cbd5645fad8b535e7c78cc9ccc49e37b5a46d7896b6d1767abc367c7ed9af7a -SIZE (hashicorp-consul-v1.9.3_GH0.tar.gz) = 30367669 +TIMESTAMP = 1615393537 +SHA256 (hashicorp-consul-v1.9.4_GH0.tar.gz) = 4f8f61d4449bb28ef857957e3dbb1926edfb0e5d2818e8ffec2677ae969b8956 +SIZE (hashicorp-consul-v1.9.4_GH0.tar.gz) = 30350632 Index: head/sysutils/consul/files/consul.in =================================================================== --- head/sysutils/consul/files/consul.in (revision 568217) +++ head/sysutils/consul/files/consul.in (revision 568218) @@ -1,90 +1,90 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: consul -# REQUIRE: NETWORKING SERVERS DAEMON +# REQUIRE: NETWORKING FILESYSTEMS defaultroute netwait resolv # KEYWORD: shutdown # # Add consul_enable="YES" to /etc/rc.conf to enable Consul # # Additional variables you can define are: # # consul_user (string): Set user to run consul. # Default is "%%USER%%". # consul_group (string): Set group to run consul. # Default is "%%GROUP%%". # consul_pidfile (string): Set full path to pid file # Default is "/var/run/consul.pid" # consul_datadir (dir): Set dir to run consul in. # Default is "%%CONSUL_DBDIR%%" # consul_syslog_output_enable (bool): Set to YES to enable syslog output # Default is "NO". See daemon(8). # consul_syslog_output_tag (str): Set syslog tag if syslog enabled. # Default is "consul". See daemon(8). # consul_syslog_output_priority (str): Set syslog priority if syslog enabled. # Default is "info". See daemon(8). # consul_syslog_output_facility (str): Set to YES to enable syslog output # Default is "daemon". See daemon(8). # # see rc.subr(8) for additional variables and options # . /etc/rc.subr name=consul rcvar=consul_enable load_rc_config $name : ${consul_enable:="NO"} : ${consul_syslog_output_enable:="NO"} : ${consul_user:="%%USER%%"} : ${consul_group:="%%GROUP%%"} : ${consul_pidfile:="/var/run/${name}.pid"} : ${consul_datadir:="%%CONSUL_DBDIR%%"} start_precmd="consul_start_precmd" extra_commands="reload" # backwards compatibility if [ -n "${consul_dir}" ]; then consul_datadir=${consul_dir} fi if checkyesno consul_syslog_output_enable; then if [ -n "${consul_syslog_output_tag}" ]; then consul_syslog_output_flags="-T ${consul_syslog_output_tag}" else consul_syslog_output_flags="-T ${name}" fi if [ -n "${consul_syslog_output_priority}" ]; then consul_syslog_output_flags="${consul_syslog_output_flags} -s ${consul_syslog_output_priority}" fi if [ -n "${consul_syslog_output_facility}" ]; then consul_syslog_output_flags="${consul_syslog_output_flags} -l ${consul_syslog_output_facility}" fi fi pidfile=${consul_pidfile} procname="%%PREFIX%%/bin/consul" command="/usr/sbin/daemon" command_args="-f -t ${name} ${consul_syslog_output_flags} -p ${pidfile} /usr/bin/env ${consul_env} ${procname} agent -data-dir=${consul_datadir} -config-dir=%%ETCDIR%% ${consul_args}" consul_start_precmd() { if [ ! -e ${pidfile} ]; then install -o ${consul_user} -g ${consul_group} /dev/null ${pidfile} fi if [ ! -d ${consul_datadir} ]; then install -d -m 0750 -o ${consul_user} -g ${consul_group} ${consul_datadir} fi if [ ! -d %%ETCDIR%% ]; then install -d -m 0750 -o ${consul_user} -g ${consul_group} %%ETCDIR%% fi } run_rc_command "$1"