Index: net/rabbitmq/Makefile
===================================================================
--- net/rabbitmq/Makefile
+++ net/rabbitmq/Makefile
@@ -1,7 +1,7 @@
 # Created by: Phillip Neumann <pneumann@gmail.com>
 
 PORTNAME=	rabbitmq
-DISTVERSION=	3.9.5
+PORTVERSION=	3.9.7
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
@@ -12,11 +12,8 @@
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE-MPL-RabbitMQ
 
-BUILD_DEPENDS=	erlang-runtime${ERLANG_VER}>=${ERLANG_VER}.0:lang/erlang-runtime${ERLANG_VER} \
-		elixir>=1.10:lang/elixir \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR} \
-		xmlto:textproc/xmlto \
-		zip:archivers/zip \
+BUILD_DEPENDS=	elixir>=1.10:lang/elixir \
+		erlang-runtime${ERLANG_VER}>=${ERLANG_VER}.0:lang/erlang-runtime${ERLANG_VER} \
 		rsync:net/rsync
 RUN_DEPENDS=	erlang-runtime${ERLANG_VER}>=${ERLANG_VER}.0:lang/erlang-runtime${ERLANG_VER}
 
Index: net/rabbitmq/distinfo
===================================================================
--- net/rabbitmq/distinfo
+++ net/rabbitmq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630317951
-SHA256 (rabbitmq-server-3.9.5.tar.xz) = 5523f819030d1fb570ff4a38c052e77c21699051a9b6a6e401c414e85865daf2
-SIZE (rabbitmq-server-3.9.5.tar.xz) = 3453660
+TIMESTAMP = 1633424875
+SHA256 (rabbitmq-server-3.9.7.tar.xz) = 238015a5a1d0dc4f8966a3ec391e53650d65321b4e61ee974ffe10dca037cfbc
+SIZE (rabbitmq-server-3.9.7.tar.xz) = 3476872
Index: net/rabbitmq/files/rabbitmq.in
===================================================================
--- net/rabbitmq/files/rabbitmq.in
+++ net/rabbitmq/files/rabbitmq.in
@@ -23,7 +23,6 @@
 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"
 
 start_cmd="${name}_start"
 stop_cmd="${name}_stop"
@@ -36,7 +35,6 @@
 # set defaults but allow admin to override them in rabbitmq_env_conf
 : ${RABBITMQ_HOME:=/var/db/${name}}
 : ${RABBITMQ_LOG_BASE:=/var/log/${name}}
-: ${RABBITMQ_PID_FILE:=${pidfile}}
 # require precise OTP version in case multiple erlangs are installed
 export PATH=%%PREFIX%%/lib/%%ERLANG_LIB%%/bin:$PATH
 
@@ -64,24 +62,15 @@
 		chmod 600 ${RABBITMQ_HOME}/.erlang.cookie
 	fi
 
-	install -o ${rabbitmq_user} /dev/null ${pidfile}
-
 	debug "Running: rabbitmq-server -detached"
 	su -m ${rabbitmq_user} -c "${rabbitmq_server} -detached" >/dev/null 2>&1
-	debug "Running: rabbitmqctl wait ${pidfile}"
-	su -m ${rabbitmq_user} -c "${rabbitmq_ctl} wait ${pidfile}" >/dev/null 2>&1
 }
 
 rabbitmq_stop()
 {
 	echo "Stopping ${name}."
-	if [ -f ${pidfile} ]; then
-		debug "Running: ${rabbitmq_ctl} stop ${pidfile}"
-		su -m ${rabbitmq_user} -c "${rabbitmq_ctl} stop ${pidfile}" >/dev/null 2>&1
-	else
-		debug "Running: ${rabbitmq_ctl} shutdown"
-		su -m ${rabbitmq_user} -c "${rabbitmq_ctl} shutdown" >/dev/null 2>&1
-	fi
+	debug "Running: ${rabbitmq_ctl} shutdown"
+	su -m ${rabbitmq_user} -c "${rabbitmq_ctl} shutdown" >/dev/null 2>&1
 }
 
 run_rc_command "$1"
Index: net/rabbitmq/pkg-plist
===================================================================
--- net/rabbitmq/pkg-plist
+++ net/rabbitmq/pkg-plist
@@ -365,21 +365,21 @@
 lib/rabbitmq_server-%%VERSION%%/plugins/jsx-3.1.0/ebin/jsx_to_json.beam
 lib/rabbitmq_server-%%VERSION%%/plugins/jsx-3.1.0/ebin/jsx_to_term.beam
 lib/rabbitmq_server-%%VERSION%%/plugins/jsx-3.1.0/ebin/jsx_verify.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli.app
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_application.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_escriptize.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_ets.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_help.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_inet.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_lib.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_mnesia.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_plugin.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_port.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_process.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_store.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_system.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/include/observer_cli.hrl
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli.app
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_application.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_escriptize.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_ets.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_help.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_inet.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_lib.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_mnesia.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_plugin.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_port.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_process.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_store.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_system.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/include/observer_cli.hrl
 lib/rabbitmq_server-%%VERSION%%/plugins/osiris-0.1.0/ebin/osiris.app
 lib/rabbitmq_server-%%VERSION%%/plugins/osiris-0.1.0/ebin/osiris.beam
 lib/rabbitmq_server-%%VERSION%%/plugins/osiris-0.1.0/ebin/osiris_app.beam
@@ -1295,25 +1295,25 @@
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%/priv/pencil.cur
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%/priv/stomp.js
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%/priv/temp-queue.html
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch.app
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch.appup
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_acceptor.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_acceptors_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_app.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_conns_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_conns_sup_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_crc32c.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_embedded_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_listener_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_protocol.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_proxy_header.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_server.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_server_proxy.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_ssl.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_tcp.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_transport.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch.app
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch.appup
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_acceptor.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_acceptors_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_app.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_conns_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_conns_sup_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_crc32c.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_embedded_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_listener_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_protocol.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_proxy_header.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_server.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_server_proxy.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_ssl.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_tcp.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_transport.beam
 lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.5.1/ebin/recon.app
 lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.5.1/ebin/recon.beam
 lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.5.1/ebin/recon_alloc.beam