6 files changed, 46 insertions, 40 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 610498b42aaf..4d750abbbca2 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rabbitmq
-PORTVERSION=	3.3.5
+PORTVERSION=	3.4.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
@@ -24,8 +24,7 @@ OPTIONS_SUB=	yes
 
 ADMIN_DESC=	Install rabbitmqadmin script
 
-USES=		gmake shebangfix
-USE_PYTHON_BUILD=yes
+USES=		gmake python:build shebangfix
 USE_RC_SUBR=	rabbitmq
 SHEBANG_FILES=	calculate-relative plugins-src/rabbitmq-amqp1.0/codegen.py
 python_OLD_CMD=	.*python
@@ -46,11 +45,11 @@ MAKE_ENV+=	TARGET_DIR="${STAGEDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${POR
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MADMIN}
-USE_PYTHON_RUN=	yes
+USES+=		python:run
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|erl|${LOCALBASE}/bin/erl|g' \
+	@${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|$${ERL_DIR}erl|${PREFIX}/bin/erl|g' \
 		${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl \
 		${SCRIPTS_DIR}/rabbitmq-env ${SCRIPTS_DIR}/rabbitmq-plugins \
 		${SCRIPTS_DIR}/rabbitmq-defaults \
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index bb33512c6171..eb0aa8fdf9d9 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rabbitmq-server-3.3.5.tar.gz) = 7a6bf8af684b2087a1c534ffcd2db1b7c15b137a38bb9f00dfdf0227f69d70c2
-SIZE (rabbitmq-server-3.3.5.tar.gz) = 3648221
+SHA256 (rabbitmq-server-3.4.0.tar.gz) = 7c42a16468d3979594da866c18085efadfe338b745c25a1dc81b9954cfd2515f
+SIZE (rabbitmq-server-3.4.0.tar.gz) = 3652861
diff --git a/net/rabbitmq/files/patch-rabbitmqctl b/net/rabbitmq/files/patch-rabbitmqctl
index e4af26fab6c8..092192b29556 100644
--- a/net/rabbitmq/files/patch-rabbitmqctl
+++ b/net/rabbitmq/files/patch-rabbitmqctl
@@ -3,12 +3,11 @@ $FreeBSD$
 
 --- scripts/rabbitmqctl.orig
 +++ scripts/rabbitmqctl
-@@ -26,7 +26,7 @@
- 
- ##--- End of overridden <var_name> variables
- 
--exec ${ERL_DIR}erl \
-+HOME=/var/db/rabbitmq exec ${ERL_DIR}erl \
+@@ -27,6 +27,7 @@
+ # (e.g. forget_cluster_node --offline) require us to impersonate the
+ # real node.
+ RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \
++HOME=/var/db/rabbitmq \
+ exec ${ERL_DIR}erl \
      -pa "${RABBITMQ_HOME}/ebin" \
      -noinput \
-     -hidden \
diff --git a/net/rabbitmq/files/patch-scripts_rabbitmq-plugins b/net/rabbitmq/files/patch-scripts_rabbitmq-plugins
new file mode 100644
index 000000000000..1d67286329dd
--- /dev/null
+++ b/net/rabbitmq/files/patch-scripts_rabbitmq-plugins
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- scripts/rabbitmq-plugins.orig
++++ scripts/rabbitmq-plugins
+@@ -19,6 +19,7 @@
+ # Non-empty defaults should be set in rabbitmq-env
+ . `dirname $0`/rabbitmq-env
+ 
++HOME=/var/db/rabbitmq \
+ exec ${ERL_DIR}erl \
+     -pa "${RABBITMQ_HOME}/ebin" \
+     -noinput \
diff --git a/net/rabbitmq/files/patch-scripts_rabbitmq-server b/net/rabbitmq/files/patch-scripts_rabbitmq-server
new file mode 100644
index 000000000000..00c8910f4b85
--- /dev/null
+++ b/net/rabbitmq/files/patch-scripts_rabbitmq-server
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- scripts/rabbitmq-server.orig
++++ scripts/rabbitmq-server
+@@ -82,6 +82,7 @@
+ set -f
+ 
+ RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
++HOME=/var/db/rabbitmq \
+ exec ${ERL_DIR}erl \
+     -pa ${RABBITMQ_EBIN_ROOT} \
+     ${RABBITMQ_START_RABBIT} \
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index ae86708350be..8e600048bc5a 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -29,12 +29,9 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/file_handle_cache.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gatherer.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gen_server2.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm_soak_test.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm_speed_test.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm_tests.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/lqueue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mirrored_supervisor.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mirrored_supervisor_tests.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mirrored_supervisor_sups.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mnesia_sync.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mochijson2.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mochinum.beam
@@ -49,6 +46,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_alarm.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_process.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_sup.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_sup_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_app.in
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_backend.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_backend_dummy.beam
@@ -59,7 +57,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_cr_demo.be
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_plain.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_autoheal.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_backing_queue.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_backing_queue_qc.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_basic.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binary_generator.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binary_parser.beam
@@ -68,6 +65,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel_interceptor.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel_sup_sup.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_cli.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_client_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_command_assembler.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_helper_sup.beam
@@ -106,7 +104,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_mode_all.bea
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_mode_exactly.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_mode_nodes.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_slave.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_slave_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_sync.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_misc.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mnesia.beam
@@ -127,6 +124,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_policies.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_policy.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_policy_validator.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_prelaunch.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_prequeue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_collector.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_consumers.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_decorator.beam
@@ -138,13 +136,10 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_restartable_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_router.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_runtime_parameter.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_runtime_parameters.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_runtime_parameters_test.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sasl_report_file_h.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ssl.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_table.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_tests.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_tests_event_receiver.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_trace.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_types.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_upgrade.beam
@@ -156,20 +151,18 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_vm.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_writer.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervised_lifecycle.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervisor2.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervisor2_tests.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_acceptor.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_acceptor_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener_sup.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/test_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/truncate.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/vm_memory_monitor.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/vm_memory_monitor_tests.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool_worker.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/gm_specs.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit.hrl
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_cli.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_framing.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_msg_store.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/README
@@ -206,18 +199,7 @@ man/man1/rabbitmq-plugins.1.gz
 man/man1/rabbitmq-server.1.gz
 man/man1/rabbitmqctl.1.gz
 man/man5/rabbitmq-env.conf.5.gz
-@dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins
-@dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/include
-@dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin
-@dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin
-@dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%
-@dirrmtry etc/rabbitmq
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rabbitmq.config.example
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
-@exec mkdir -p /var/log/rabbitmq
-@exec chown -R rabbitmq:rabbitmq /var/log/rabbitmq
-@exec mkdir -p /var/db/rabbitmq/mnesia
-@exec chown -R rabbitmq:rabbitmq /var/db/rabbitmq
-@dirrmtry /var/log/rabbitmq
-@dirrmtry /var/db/rabbitmq/mnesia
-@dirrmtry /var/db/rabbitmq
+@dir(rabbitmq,rabbitmq,755) /var/log/rabbitmq
+@dir(rabbitmq,rabbitmq,755) /var/db/rabbitmq/mnesia
+@dir(rabbitmq,rabbitmq,755) /var/db/rabbitmq