Index: branches/2018Q1/net/rabbitmq/Makefile
===================================================================
--- branches/2018Q1/net/rabbitmq/Makefile	(revision 463971)
+++ branches/2018Q1/net/rabbitmq/Makefile	(revision 463972)
@@ -1,83 +1,84 @@
 # Created by: Phillip Neumann <pneumann@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	rabbitmq
 PORTVERSION=	3.6.14
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	RabbitMQ is an implementation of AMQP
 
 LICENSE=	MPL11
 LICENSE_FILE=	${WRKSRC}/LICENSE-MPL-RabbitMQ
 
 BUILD_DEPENDS=	erlang-runtime19>=19.0:lang/erlang-runtime19 \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson \
 		xmlto:textproc/xmlto \
 		zip:archivers/zip \
 		rsync:net/rsync
 RUN_DEPENDS=	erlang-runtime19>=19.0:lang/erlang-runtime19
 
 OPTIONS_DEFINE=	ADMIN
 OPTIONS_SUB=	yes
 
 ADMIN_DESC=	Install rabbitmqadmin script
 ADMIN_USES=	python
 ADMIN_USES_OFF=	python:build
 
 ALL_TARGET=	all manpages
 USES=		cpe gmake shebangfix tar:xz
 USE_RC_SUBR=	rabbitmq
 NO_ARCH=	yes
 
 USERS=		rabbitmq
 GROUPS=		rabbitmq
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 CPE_VENDOR=	pivotal_software
 
 REINPLACE_ARGS=	-i ""
 SCRIPTS_DIR=	${WRKSRC}/deps/rabbit/scripts
 SHEBANG_FILES=	deps/rabbitmq_management/bin/rabbitmqadmin
 MAKE_ARGS+=	PYTHON=${PYTHON_CMD}
 MAKE_ENV+=	PATH="${LOCALBASE}/lib/erlang19/bin:${PATH}" \
 		TARGET_DIR="${STAGEDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" \
 		SBIN_DIR="${STAGEDIR}${PREFIX}/sbin/" \
 		MAN_DIR="${STAGEDIR}${PREFIX}/man" \
 		DOC_INSTALL_DIR="${STAGEDIR}${EXAMPLESDIR}" \
 		VERSION="${PORTVERSION}"
 
 MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|$${ERL_DIR}erl|${PREFIX}/lib/erlang19/bin/erl|g' \
 		${SCRIPTS_DIR}/rabbitmq-server \
 		${SCRIPTS_DIR}/rabbitmqctl \
 		${SCRIPTS_DIR}/rabbitmq-env \
 		${SCRIPTS_DIR}/rabbitmq-plugins \
 		${SCRIPTS_DIR}/rabbitmq-defaults \
 		${WRKSRC}/deps/rabbit/docs/rabbitmq-env.conf.5.xml
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/rabbitmq
 	@${MKDIR} ${STAGEDIR}/var/db/rabbitmq/mnesia
 	@${MKDIR} ${STAGEDIR}/var/log/rabbitmq
 	${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/rabbitmq.config.example \
 		${STAGEDIR}${PREFIX}/etc/rabbitmq/rabbitmq.config.sample
 .for _file in rabbitmq-defaults rabbitmq-env rabbitmq-plugins rabbitmq-server rabbitmqctl
 	${LN} -s ../lib/erlang/lib/rabbitmq_server-${PORTVERSION}/sbin/${_file} ${STAGEDIR}${PREFIX}/sbin
 .endfor
 .for _file in rabbitmq-plugins.1 rabbitmq-server.1 rabbitmqctl.1
 	${INSTALL_MAN} ${WRKSRC}/deps/rabbit/docs/${_file} ${STAGEDIR}${MAN1PREFIX}/man/man1
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/deps/rabbit/docs/rabbitmq-env.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 
 post-install-ADMIN-on:
 	${INSTALL} ${WRKSRC}/deps/rabbitmq_management/bin/rabbitmqadmin ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: branches/2018Q1/net/rabbitmq/files/rabbitmq.in
===================================================================
--- branches/2018Q1/net/rabbitmq/files/rabbitmq.in	(revision 463971)
+++ branches/2018Q1/net/rabbitmq/files/rabbitmq.in	(revision 463972)
@@ -1,79 +1,79 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: rabbitmq
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable RabbitMQ
 #
 #  rabbitmq_enable="YES"
 
 . /etc/rc.subr
 
 name=rabbitmq
 rcvar=rabbitmq_enable
 
 load_rc_config $name
 
 # Set some defaults
 : ${rabbitmq_enable="NO"}
 : ${rabbitmq_user="rabbitmq"}
 
 rabbitmq_server="%%PREFIX%%/sbin/rabbitmq-server"
 rabbitmq_ctl="%%PREFIX%%/sbin/rabbitmqctl"
 rabbitmq_env_conf="%%PREFIX%%/etc/rabbitmq/rabbitmq-env.conf"
 pidfile="/var/run/${name}.pid"
 daemon_pidfile="/var/run/${name}-daemon.pid"
 
 start_cmd="${name}_start"
 stop_cmd="${name}_stop"
 rotate_logs_cmd="su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} rotate_logs\"'"
 status_cmd="su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} status\"'"
 extra_commands="rotate_logs status"
 
 : ${RABBITMQ_LOG_BASE:=/var/log/${name}}
 
 if [ -f ${rabbitmq_env_conf} ]; then
     . ${rabbitmq_env_conf}
 fi
 
 export RABBITMQ_HOME=/var/db/${name}
 
 # Prevent conflicts with amqp_client and rabbit_common applications that
 # may be installed in ERL_LIBS.
 unset ERL_LIBS
 
 rabbitmq_start()
 {
 	echo "Starting ${name}."
 
 	if [ -d ${RABBITMQ_HOME} ]; then
 		chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_HOME}
 	fi
 
 	mkdir -p ${RABBITMQ_LOG_BASE}
  
-	chown ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOG_BASE}
+	chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOG_BASE}
 
 	if [ -f ${RABBITMQ_HOME}/.erlang.cookie ]; then
 		chmod 600 ${RABBITMQ_HOME}/.erlang.cookie
 	fi
 
 	env HOME=${RABBITMQ_HOME} /usr/sbin/daemon -c -f -u ${rabbitmq_user} -p ${pidfile} -P ${daemon_pidfile} ${rabbitmq_server}
 	debug "Running: rabbitmqctl wait ${pidfile}"
 	${rabbitmq_ctl} wait ${pidfile} >/dev/null 2>&1
 }
 
 rabbitmq_stop()
 {
 	echo "Stopping ${name}."
 	[ -f ${daemon_pidfile} ] && read daemon_pid < ${daemon_pidfile}
 	debug "Running: ${rabbitmq_ctl} stop ${pidfile}"
 	su -m ${rabbitmq_user} -c "sh -c \"${rabbitmq_ctl} stop ${pidfile}\"" >/dev/null 2>&1
 	[ -n "${daemon_pid}" ] && wait_for_pids ${daemon_pid}
 }
 
 run_rc_command "$1"
Index: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 463971)
+++ branches/2018Q1	(revision 463972)

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