Index: head/sysutils/consul/Makefile =================================================================== --- head/sysutils/consul/Makefile (revision 425856) +++ head/sysutils/consul/Makefile (revision 425857) @@ -1,52 +1,46 @@ # $FreeBSD$ PORTNAME= consul -PORTVERSION= 0.7.0 +PORTVERSION= 0.7.1 DISTVERSIONPREFIX= v CATEGORIES= sysutils -MASTER_SITES= https://releases.hashicorp.com/consul/${PORTVERSION}/:web_ui -DISTFILES= consul_${PORTVERSION}_web_ui.zip:web_ui MAINTAINER= swills@FreeBSD.org COMMENT= Service discovery and configuration made easy LICENSE= MPL 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 USERS= consul GROUPS= consul STRIP= # stripping can break go binaries post-extract: @${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/ do-build: @cd ${WRKSRC}/src/github.com/hashicorp/consul; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build \ -ldflags "-X main.GitDescribe=v${PORTVERSION}" -o bin/consul do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/consul/bin/consul ${STAGEDIR}${PREFIX}/bin/consul - ${MKDIR} ${STAGEDIR}${DATADIR} - ${MKDIR} ${WRKDIR}/dist - ${MV} ${WRKDIR}/index.html ${WRKDIR}/static ${WRKDIR}/dist - cd ${WRKDIR}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} .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 425856) +++ head/sysutils/consul/distinfo (revision 425857) @@ -1,5 +1,5 @@ -TIMESTAMP = 1475593864 -SHA256 (consul_0.7.0_web_ui.zip) = 42212089c228a73a0881a5835079c8df58a4f31b5060a3b4ffd4c2497abe3aa8 -SIZE (consul_0.7.0_web_ui.zip) = 255229 -SHA256 (hashicorp-consul-v0.7.0_GH0.tar.gz) = d3616f204370aa199df516d792fe0835019aed7b6596aa7f6bdc71c2b1067494 -SIZE (hashicorp-consul-v0.7.0_GH0.tar.gz) = 3625239 +TIMESTAMP = 1478821632 +SHA256 (consul_0.7.1_web_ui.zip) = 1b793c60e1af24cc470421d0411e13748f451b51d8a6ed5fcabc8d00bfb84264 +SIZE (consul_0.7.1_web_ui.zip) = 255257 +SHA256 (hashicorp-consul-v0.7.1_GH0.tar.gz) = d1498c851df8aa150c7b4398fdbb74467af4949d20ce5b4840b88095fce71135 +SIZE (hashicorp-consul-v0.7.1_GH0.tar.gz) = 4003354 Index: head/sysutils/consul/files/consul.in =================================================================== --- head/sysutils/consul/files/consul.in (revision 425856) +++ head/sysutils/consul/files/consul.in (revision 425857) @@ -1,56 +1,56 @@ #!/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/tmp/consul". # consul_env (dir): Set environment variables used with consul # Default is "". . /etc/rc.subr name=consul rcvar=consul_enable extra_commands="reload" load_rc_config $name : ${consul_enable:="NO"} : ${consul_user:="consul"} : ${consul_group:="consul"} : ${consul_dir:="/var/tmp/consul"} : ${consul_env:=""} 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} -ui-dir=%%PREFIX%%/share/consul -config-dir=%%PREFIX%%/etc/consul.d ${consul_args}" +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 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 } run_rc_command "$1" Index: head/sysutils/consul/pkg-descr =================================================================== --- head/sysutils/consul/pkg-descr (revision 425856) +++ head/sysutils/consul/pkg-descr (revision 425857) @@ -1,4 +1,4 @@ -Consule is a distributed, highly available and data center aware tool for +Consul is a distributed, highly available and data center aware tool for discovering and configuring services. WWW: https://consul.io/ Index: head/sysutils/consul/pkg-plist =================================================================== --- head/sysutils/consul/pkg-plist (revision 425856) +++ head/sysutils/consul/pkg-plist (revision 425857) @@ -1,9 +1 @@ bin/consul -%%DATADIR%%/index.html -%%DATADIR%%/static/application.min.js -%%DATADIR%%/static/base.css -%%DATADIR%%/static/base.css.map -%%DATADIR%%/static/bootstrap.min.css -%%DATADIR%%/static/consul-logo.png -%%DATADIR%%/static/favicon.png -%%DATADIR%%/static/loading-cylon-purple.svg