Index: branches/2018Q2/databases/go-carbon/Makefile
===================================================================
--- branches/2018Q2/databases/go-carbon/Makefile	(revision 466595)
+++ branches/2018Q2/databases/go-carbon/Makefile	(revision 466596)
@@ -1,39 +1,39 @@
 # $FreeBSD$
 
 PORTNAME=		go-carbon
 DISTVERSIONPREFIX=	v
 DISTVERSION=		0.12.0
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		databases
 
 MAINTAINER=		a.andersson.thn@gmail.com
 COMMENT=		Go implementation of carbon
 
 LICENSE=		MIT
 LICENSE_FILE=		${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=		go>=1.8:lang/go
 
 USES=			go
 
 USE_GITHUB=		yes
 GH_ACCOUNT=		lomik
 USE_RC_SUBR=		${PORTNAME}
 
 USERS=			carbon
 GROUPS=			carbon
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}/_vendor \
 		go build --ldflags '-X main.BuildVersion=${DISTVERSION}' github.com/lomik/go-carbon
 
 do-install:
 	@${MKDIR} ${STAGEDIR}/var/db/go-carbon
 	@${MKDIR} ${STAGEDIR}/var/log/go-carbon
 	@${MKDIR} ${STAGEDIR}/${PREFIX}/etc/go-carbon
 	${INSTALL_PROGRAM} ${WRKSRC}/go-carbon ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/deploy/go-carbon.conf ${STAGEDIR}${PREFIX}/etc/go-carbon/go-carbon.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/deploy/storage-aggregation.conf ${STAGEDIR}${PREFIX}/etc/go-carbon/storage-aggregation.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/deploy/storage-schemas.conf ${STAGEDIR}${PREFIX}/etc/go-carbon/storage-schemas.conf.sample
 
 .include <bsd.port.mk>
Index: branches/2018Q2/databases/go-carbon/files/go-carbon.in
===================================================================
--- branches/2018Q2/databases/go-carbon/files/go-carbon.in	(revision 466595)
+++ branches/2018Q2/databases/go-carbon/files/go-carbon.in	(revision 466596)
@@ -1,55 +1,56 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: go-carbon
 # REQUIRE: LOGIN
 # BEFORE:  securelevel
 # KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable `go-carbon':
 #
 # go_carbon_enable="YES"
 #
 # optional:
 #
 # go_carbon_conf (flags):      Set extra flags here. More options in go-carbon(1)
 #                               Default is empty "".
 # go_carbon_user (user):        Set user to run go-carbon.
 #                               Default is "carbon".
 
 . /etc/rc.subr
 
-name="go-carbon"
+name="go_carbon"
 rcvar="go_carbon_enable"
+load_rc_config $name
 
 : ${go_carbon_enable:="NO"}
 : ${go_carbon_user:="carbon"}
 : ${go_carbon_config:="/usr/local/etc/go-carbon/go-carbon.conf"}
 
-start_cmd="go_carbon_start"
-stop_cmd="go_carbon_stop"
-status_cmd="go_carbon_status"
-procname="/usr/local/bin/go-carbon"
 pidfile="/var/run/$name.pid"
+procname="%%PREFIX%%/bin/go-carbon"
+command=/usr/sbin/daemon
+command_args="-f -c -p ${pidfile} ${procname} -config ${go_carbon_config}"
 
-# read configuration and set defaults
-load_rc_config "$name"
+extra_commands="reload"
+reload_command="go_carbon_reload"
+start_precmd="go_carbon_precmd"
 
-go_carbon_start()
+go_carbon_precmd()
 {
-	${procname} -config ${go_carbon_config} -daemon -pidfile ${pidfile}
+	install -o ${go_carbon_user} /dev/null ${pidfile}
 }
 
-go_carbon_stop()
+carbonapi_reload()
 {
-	kill -TERM `cat /var/run/go-carbon.pid`
-}
-
-go_carbon_status()
-{
-	echo "go-carbon is running as pid" `cat /var/run/go-carbon.pid`
+	if [ -n "$pid" ]; then
+		kill -HUP $pid
+		echo "go-carbon config reloaded."
+	else
+		echo "go-carbon not running."
+	fi
 }
 
 run_rc_command "$1"
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 466595)
+++ branches/2018Q2	(revision 466596)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r466198