Index: head/sysutils/consul/Makefile =================================================================== --- head/sysutils/consul/Makefile (revision 455626) +++ head/sysutils/consul/Makefile (revision 455627) @@ -1,52 +1,51 @@ # $FreeBSD$ PORTNAME= consul -PORTVERSION= 0.9.3 -PORTREVISION= 1 +PORTVERSION= 1.0.1 DISTVERSIONPREFIX= v CATEGORIES= sysutils MAINTAINER= swills@FreeBSD.org COMMENT= Service discovery and configuration made easy LICENSE= MPL20 BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go USES= compiler USE_GITHUB= yes GH_ACCOUNT= hashicorp GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} USE_RC_SUBR= consul PLIST_FILES= bin/consul USERS= consul GROUPS= consul post-extract: @${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/ do-build: @cd ${WRKSRC}/src/github.com/hashicorp/consul; ${SETENV} CGO_ENABLED=0 ${BUILD_ENV} GOPATH=${WRKSRC} go build \ -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} \ " \ -o bin/consul do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/consul/bin/consul ${STAGEDIR}${PREFIX}/bin/consul .include # golang assumes that if clang is in use, it is called "clang" and not "cc". If # it's called "cc", go fails. .if ${COMPILER_TYPE} == clang BUILD_ENV= CC=clang .endif .include Index: head/sysutils/consul/distinfo =================================================================== --- head/sysutils/consul/distinfo (revision 455626) +++ head/sysutils/consul/distinfo (revision 455627) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505222411 -SHA256 (hashicorp-consul-v0.9.3_GH0.tar.gz) = 69b76432203e046a8025ce13f7cc041b2308d72f07f240a57f2ba5d580fcff70 -SIZE (hashicorp-consul-v0.9.3_GH0.tar.gz) = 7278357 +TIMESTAMP = 1512496236 +SHA256 (hashicorp-consul-v1.0.1_GH0.tar.gz) = 3b28237dcf055445247a3fe6b9a9a575fd584df721e25477769a5e91b1f2cdce +SIZE (hashicorp-consul-v1.0.1_GH0.tar.gz) = 7972294 Index: head/sysutils/consul/files/consul.in =================================================================== --- head/sysutils/consul/files/consul.in (revision 455626) +++ head/sysutils/consul/files/consul.in (revision 455627) @@ -1,61 +1,52 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: consul # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # consul_enable (bool): Set to NO by default. # Set it to YES to enable consul. # consul_user (user): Set user to run consul. # Default is "consul". # consul_group (group): Set group to run consul. # Default is "consul". # consul_dir (dir): Set dir to run consul in. # Default is "/var/db/consul". . /etc/rc.subr name=consul rcvar=consul_enable extra_commands="reload configtest" load_rc_config $name : ${consul_enable:="NO"} : ${consul_user:="consul"} : ${consul_group:="consul"} : ${consul_dir:="/var/db/consul"} pidfile=/var/run/consul.pid procname="%%PREFIX%%/bin/consul" command="/usr/sbin/daemon" command_args="-f -p ${pidfile} /usr/bin/env ${consul_env} ${procname} agent -data-dir=${consul_dir} -config-dir=%%PREFIX%%/etc/consul.d ${consul_args}" start_precmd=consul_startprecmd -restart_precmd=consul_checkconfig -reload_precmd=consul_checkconfig -configtest_cmd=consul_checkconfig consul_startprecmd() { if [ ! -e ${pidfile} ]; then install -o ${consul_user} -g ${consul_group} /dev/null ${pidfile}; fi if [ ! -d ${consul_dir} ]; then install -d -o ${consul_user} -g ${consul_group} ${consul_dir} fi - consul_checkconfig -} - -consul_checkconfig() -{ - ${procname} validate /usr/local/etc/consul.d } run_rc_command "$1"