Update rabbitmq to 3.1.0.

Notable changes:
 - eager synchronisation of mirror queue slaves;
 - automatic cluster partition healing;
 - improved statistics (including charts) in the management plugin;
 - many smaller new features, bug fixes and performance improvements.

See release notes for full changelog:

http://www.rabbitmq.com/release-notes/README-3.1.0.txt

4 files changed, 19 insertions, 9 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 56d04a203e4..497ffd5dcb3 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/04/02 10:40:36 fhajny Exp $
+# $NetBSD: Makefile,v 1.11 2013/05/13 11:51:38 fhajny Exp $
 #
 
 PKGNAME=		rabbitmq-${RMQ_VERSION}
@@ -16,6 +16,7 @@ USE_TOOLS+=		bash:run coreutils gmake unzip zip
 MAKE_JOBS_SAFE=		no
 
 BUILD_DEPENDS+=		libxslt-[0-9]*:../../textproc/libxslt
+BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 BUILD_DEPENDS+=		xmlto-[0-9]*:../../textproc/xmlto
 DEPENDS+=		coreutils-[0-9]*:../../sysutils/coreutils
 DEPENDS+=		${PYPKGPREFIX}-simplejson>=2:../../converters/py-simplejson
@@ -83,6 +84,7 @@ INSTALL_ENV+=		RMQ_VERSION=${RMQ_VERSION}
 INSTALL_ENV+=		MAKE_SHELL="${RMQ_SHELL}"
 
 REPLACE_PYTHON+=	calculate-relative
+REPLACE_PYTHON+=	plugins-src/rabbitmq-amqp1.0/codegen.py
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/rabbitmq-env.conf ${DESTDIR}${PREFIX}/share/examples/rabbitmq/rabbitmq-env.conf
diff --git a/net/rabbitmq/PLIST b/net/rabbitmq/PLIST
index 29cbbc8d616..b19eab35018 100644
--- a/net/rabbitmq/PLIST
+++ b/net/rabbitmq/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.7 2013/04/02 10:40:36 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/05/13 11:51:38 fhajny Exp $
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/INSTALL
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-APACHE2-ExplorerCanvas
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-APL2-Stomp-Websocket
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-Apache-Basho
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-BSD-base64js
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-BSD-glMatrix
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-EJS10
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-Flot
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-Mochi
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-Sammy060
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-eldap
@@ -48,6 +50,7 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_auth_mechanism.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_auth_mechanism_amqplain.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_auth_mechanism_cr_demo.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_auth_mechanism_plain.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_autoheal.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_backing_queue.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_backing_queue_qc.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_basic.beam
@@ -87,8 +90,13 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_memory_monitor.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_coordinator.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_master.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_misc.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_mode.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_mode_all.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_mode_exactly.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_mode_nodes.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_slave.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_slave_sup.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_sync.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_misc.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mnesia.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_msg_file.beam
@@ -151,6 +159,7 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/amqp_client-0.0.0.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/cowboy-0.5.0-rmq0.0.0-git4b93c2d.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/eldap-0.0.0-gite309de4.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/mochiweb-2.3.1-rmq0.0.0-gitd541e9a.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_amqp1_0-0.0.0.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_auth_backend_ldap-0.0.0.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_auth_mechanism_ssl-0.0.0.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_consistent_hash_exchange-0.0.0.ez
@@ -163,7 +172,6 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_management-0.0.0.e
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_management_agent-0.0.0.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_management_visualiser-0.0.0.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_mqtt-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_old_federation-0.0.0.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_shovel-0.0.0.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_shovel_management-0.0.0.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_stomp-0.0.0.ez
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 5e9f260f607..4e4f3133af2 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2013/04/02 10:40:36 fhajny Exp $
+$NetBSD: distinfo,v 1.9 2013/05/13 11:51:38 fhajny Exp $
 
-SHA1 (rabbitmq-server-3.0.4.tar.gz) = 8472bc79bcc9c0696447610ca801e387099e75ae
-RMD160 (rabbitmq-server-3.0.4.tar.gz) = 1625a2ab023741b8baa1e2a8c7bec74b79bc09bf
-Size (rabbitmq-server-3.0.4.tar.gz) = 3314866 bytes
+SHA1 (rabbitmq-server-3.1.0.tar.gz) = 4a1eae671fe159bf6fb8a99bc3f89e5053832021
+RMD160 (rabbitmq-server-3.1.0.tar.gz) = 057ebb85d73d2163d5a7d9dc5d5495c9bed4c30e
+Size (rabbitmq-server-3.1.0.tar.gz) = 3526907 bytes
 SHA1 (patch-aa) = 16a822321caacb0e4588791ec4dc1e909d0be4de
diff --git a/net/rabbitmq/version.mk b/net/rabbitmq/version.mk
index 53c2f1957eb..acf57282c6f 100644
--- a/net/rabbitmq/version.mk
+++ b/net/rabbitmq/version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.8 2013/04/02 10:40:36 fhajny Exp $
+# $NetBSD: version.mk,v 1.9 2013/05/13 11:51:38 fhajny Exp $
 #
 
-RMQ_VERSION=	3.0.4
+RMQ_VERSION=	3.1.0