3 files changed, 22 insertions, 6 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 518d644e98ca..5caaebfef0e4 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rabbitmq
-PORTVERSION=	1.6.0
+PORTVERSION=	1.7.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
@@ -35,7 +35,8 @@ SUB_LIST=	RABBITMQ_GID=${RABBITMQ_GID} \
 		RABBITMQ_UID=${RABBITMQ_UID} \
 		RABBITMQ_USER=${RABBITMQ_USER}
 
-MAN1=		rabbitmq-multi.1 rabbitmq-server.1 rabbitmqctl.1
+MAN1=		rabbitmq-multi.1 rabbitmq-server.1 rabbitmqctl.1 \
+		rabbitmq-activate-plugins.1 rabbitmq-deactivate-plugins.1
 MAN5=		rabbitmq.conf.5
 MANCOMPRESSED=	yes
 
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 825f788cecf3..61534bbd2947 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,3 +1,3 @@
-MD5 (rabbitmq-server-1.6.0.tar.gz) = af3b0d868d58e5aefb4f0837b82ca010
-SHA256 (rabbitmq-server-1.6.0.tar.gz) = 0a6e0f6b41548906b07f51be1651e8c05b3621f1c238e7969ef1dc40c47a7a0a
-SIZE (rabbitmq-server-1.6.0.tar.gz) = 130616
+MD5 (rabbitmq-server-1.7.0.tar.gz) = 4505ca0fd8718439bd6f5e2af2379e56
+SHA256 (rabbitmq-server-1.7.0.tar.gz) = a73c25ff0e725a2b9afb37e3796ad46c32f5f6c097091f6c0e40ccc878db9e4a
+SIZE (rabbitmq-server-1.7.0.tar.gz) = 143252
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index 85a504961904..5c61b06f4235 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -1,3 +1,6 @@
+sbin/rabbitmq-activate-plugins
+sbin/rabbitmq-deactivate-plugins
+sbin/rabbitmq-env
 sbin/rabbitmq-multi
 sbin/rabbitmq-server
 sbin/rabbitmqctl
@@ -8,7 +11,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gen_server2.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/priority_queue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.app
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.rel
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_access_control.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_alarm.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue.beam
@@ -20,23 +22,29 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binary_generator.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binary_parser.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_control.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_dialyzer.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_error_logger.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_error_logger_file_h.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_guid.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_hooks.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_channel.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_heartbeat.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_limiter.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_load.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_log.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memsup.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memsup_darwin.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memsup_linux.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_misc.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mnesia.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_multi.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_net.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_networking.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_node_monitor.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_persister.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugin_activator.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_reader.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_router.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sasl_report_file_h.beam
@@ -52,7 +60,14 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_framing.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_framing_spec.hrl
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-activate-plugins
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-deactivate-plugins
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-env
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-multi
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-server
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmqctl
 @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