Update rabbitmq to 3.0.4

Major changes in 3.0.0:
- Policy-based configuration of mirroring and federation
- Revamped clustering commands
- Web-STOMP and MQTT plug-ins
- Per-message TTL

Too many bugfixes since 2.8.2, please see individual changelogs:

http://www.rabbitmq.com/changelog.html

5 files changed, 192 insertions, 169 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 3a338d36066..56d04a203e4 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/23 17:19:04 asau Exp $
+# $NetBSD: Makefile,v 1.10 2013/04/02 10:40:36 fhajny Exp $
 #
 
 PKGNAME=		rabbitmq-${RMQ_VERSION}
@@ -13,6 +13,8 @@ LICENSE=		mpl-1.1
 
 USE_TOOLS+=		bash:run coreutils gmake unzip zip
 
+MAKE_JOBS_SAFE=		no
+
 BUILD_DEPENDS+=		libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=		xmlto-[0-9]*:../../textproc/xmlto
 DEPENDS+=		coreutils-[0-9]*:../../sysutils/coreutils
@@ -72,6 +74,7 @@ MAKE_ENV+=		SBIN_DIR="${DESTDIR}${PREFIX}/sbin/"
 MAKE_ENV+=		MAN_DIR="${DESTDIR}${PREFIX}/man"
 MAKE_ENV+=		RMQ_VERSION=${RMQ_VERSION}
 MAKE_ENV+=		MAKE_SHELL="${RMQ_SHELL}"
+MAKE_ENV+=		GIT_SSL_NO_VERIFY=true
 
 INSTALL_ENV+=		TARGET_DIR="${DESTDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}"
 INSTALL_ENV+=		SBIN_DIR="${DESTDIR}${PREFIX}/sbin/"
diff --git a/net/rabbitmq/PLIST b/net/rabbitmq/PLIST
index 4961d8a3d2e..29cbbc8d616 100644
--- a/net/rabbitmq/PLIST
+++ b/net/rabbitmq/PLIST
@@ -1,162 +1,184 @@
-@comment $NetBSD: PLIST,v 1.6 2012/05/11 11:15:12 fhajny Exp $
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/INSTALL
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-Apache-Basho
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-BSD-glMatrix
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-MIT-EJS10
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-MIT-Mochi
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-MIT-Sammy060
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-MIT-eldap
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-MIT-jQuery164
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-MPL-RabbitMQ
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/credit_flow.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/delegate.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/delegate_sup.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/dtree.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/file_handle_cache.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gatherer.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gen_server2.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gm.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gm_soak_test.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gm_speed_test.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gm_tests.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/lqueue.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/pg_local.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/mirrored_supervisor.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/mirrored_supervisor_tests.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/mnesia_sync.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/pg2_fixed.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/pmon.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/priority_queue.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit.app
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_access_control.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_alarm.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_amqqueue.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_amqqueue_process.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_amqqueue_sup.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_app.in
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_auth_backend.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_auth_backend_internal.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_auth_mechanism.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_auth_mechanism_amqplain.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_auth_mechanism_cr_demo.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_auth_mechanism_plain.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_backing_queue.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_backing_queue_qc.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_basic.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_binary_generator.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_binary_parser.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_binding.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_channel.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_channel_sup.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_channel_sup_sup.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_client_sup.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_command_assembler.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_connection_sup.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_control.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_ctl_usage.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_direct.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_disk_monitor.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_error_logger.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_error_logger_file_h.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_event.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type_direct.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type_fanout.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type_headers.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type_invalid.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type_topic.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_file.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_framing.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_framing_amqp_0_8.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_framing_amqp_0_9_1.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_guid.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_heartbeat.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_limiter.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_log.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_memory_monitor.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_mirror_queue_coordinator.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_mirror_queue_master.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_mirror_queue_misc.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_mirror_queue_slave.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_mirror_queue_slave_sup.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_misc.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_mnesia.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_msg_file.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_msg_store.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_msg_store_ets_index.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_msg_store_gc.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_msg_store_index.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_net.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_networking.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_node_monitor.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_nodes.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_plugins.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_plugins_usage.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_prelaunch.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_queue_collector.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_queue_index.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_reader.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_registry.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_restartable_sup.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_router.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_sasl_report_file_h.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_ssl.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_sup.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_tests.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_tests_event_receiver.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_trace.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_types.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_upgrade.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_upgrade_functions.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_variable_queue.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_version.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_vhost.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_writer.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/supervisor2.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/tcp_acceptor.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/tcp_acceptor_sup.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/tcp_listener.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/tcp_listener_sup.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/test_sup.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/vm_memory_monitor.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/worker_pool.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/worker_pool_sup.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/worker_pool_worker.beam
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/gm_specs.hrl
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit.hrl
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_framing.hrl
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_msg_store.hrl
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/README
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/amqp_client-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/eldap-0.0.0-git.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/erlando-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/mochiweb-1.3-rmq0.0.0-git.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_auth_backend_ldap-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_auth_mechanism_ssl-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_consistent_hash_exchange-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_federation-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_federation_management-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_jsonrpc-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_jsonrpc_channel-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_jsonrpc_channel_examples-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_management-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_management_agent-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_management_visualiser-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_mochiweb-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_shovel-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_shovel_management-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_stomp-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_tracing-0.0.0.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rfc4627_jsonrpc-0.0.0-git.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/webmachine-1.7.0-rmq0.0.0-hg.ez
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmq-defaults
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmq-env
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmq-plugins
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmq-server
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmqctl
+@comment $NetBSD: PLIST,v 1.7 2013/04/02 10:40:36 fhajny Exp $
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/INSTALL
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE
+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-Mochi
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-Sammy060
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-eldap
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-jQuery164
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MPL-RabbitMQ
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/app_utils.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/background_gc.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/credit_flow.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/delegate.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/delegate_sup.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/dtree.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/file_handle_cache.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/gatherer.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/gen_server2.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/gm.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/gm_soak_test.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/gm_speed_test.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/gm_tests.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/lqueue.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/mirrored_supervisor.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/mirrored_supervisor_tests.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/mnesia_sync.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/mochijson2.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/mochinum.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/pg2_fixed.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/pg_local.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/pmon.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/priority_queue.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit.app
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_access_control.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_alarm.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_amqqueue.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_amqqueue_process.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_amqqueue_sup.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_app.in
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_auth_backend.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_auth_backend_internal.beam
+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_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
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_binary_generator.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_binary_parser.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_binding.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_channel.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_channel_sup.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_channel_sup_sup.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_client_sup.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_command_assembler.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_connection_sup.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_control_main.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_ctl_usage.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_direct.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_disk_monitor.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_error_logger.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_error_logger_file_h.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_event.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_decorator.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_type.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_type_direct.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_type_fanout.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_type_headers.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_type_invalid.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_type_topic.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_file.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_framing.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_framing_amqp_0_8.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_framing_amqp_0_9_1.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_guid.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_heartbeat.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_limiter.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_log.beam
+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_slave.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_slave_sup.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
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_msg_store.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_msg_store_ets_index.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_msg_store_gc.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_msg_store_index.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_net.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_networking.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_node_monitor.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_nodes.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_parameter_validation.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_plugins.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_plugins_main.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_plugins_usage.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_policy.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_policy_validator.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_prelaunch.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_collector.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_index.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_reader.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_registry.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_restartable_sup.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_router.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_runtime_parameter.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_runtime_parameters.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_runtime_parameters_test.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_sasl_report_file_h.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_ssl.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_sup.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_table.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_tests.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_tests_event_receiver.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_trace.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_types.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_upgrade.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_upgrade_functions.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_variable_queue.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_version.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_vhost.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_vm.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_writer.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/supervisor2.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/supervisor2_tests.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/tcp_acceptor.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/tcp_acceptor_sup.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/tcp_listener.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/tcp_listener_sup.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/test_sup.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/vm_memory_monitor.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/worker_pool.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/worker_pool_sup.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/worker_pool_worker.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/gm_specs.hrl
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit.hrl
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit_framing.hrl
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit_msg_store.hrl
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/README
+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_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
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_federation-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_federation_management-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_jsonrpc-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_jsonrpc_channel-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_jsonrpc_channel_examples-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_management-0.0.0.ez
+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
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_tracing-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_web_dispatch-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_web_stomp-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_web_stomp_examples-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rfc4627_jsonrpc-0.0.0-git7ab174b.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/sockjs-0.3.4-rmq0.0.0-git3132eb9.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/webmachine-1.9.1-rmq0.0.0-git52e62bc.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-defaults
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-env
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-plugins
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-server
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmqctl
 man/man1/rabbitmq-plugins.1
 man/man1/rabbitmq-server.1
 man/man1/rabbitmqctl.1
diff --git a/net/rabbitmq/buildlink3.mk b/net/rabbitmq/buildlink3.mk
index 53159a30f30..f537ba14d19 100644
--- a/net/rabbitmq/buildlink3.mk
+++ b/net/rabbitmq/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2011/12/14 11:55:20 fhajny Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2013/04/02 10:40:36 fhajny Exp $
 
 BUILDLINK_TREE+=			rabbitmq
 
@@ -6,8 +6,6 @@ BUILDLINK_TREE+=			rabbitmq
 RABBITMQ_BUILDLINK3_MK:=
 
 .include "version.mk"
-RABBITMQ_PLUGINS=	lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins
-
 BUILDLINK_API_DEPENDS.rabbitmq+=	rabbitmq>=2.1.0
 BUILDLINK_PKGSRCDIR.rabbitmq?=		../../net/rabbitmq
 
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index be9128278b8..5e9f260f607 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2012/05/11 11:15:12 fhajny Exp $
+$NetBSD: distinfo,v 1.8 2013/04/02 10:40:36 fhajny Exp $
 
-SHA1 (rabbitmq-server-2.8.2.tar.gz) = 3d0da2996a30747c5875cfbf887c61d80d765ef4
-RMD160 (rabbitmq-server-2.8.2.tar.gz) = 89509488902089d3c457dfcf3cc44a6b615b33cf
-Size (rabbitmq-server-2.8.2.tar.gz) = 2643667 bytes
+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 (patch-aa) = 16a822321caacb0e4588791ec4dc1e909d0be4de
diff --git a/net/rabbitmq/version.mk b/net/rabbitmq/version.mk
index 06622d76016..53c2f1957eb 100644
--- a/net/rabbitmq/version.mk
+++ b/net/rabbitmq/version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.7 2012/05/11 11:15:12 fhajny Exp $
+# $NetBSD: version.mk,v 1.8 2013/04/02 10:40:36 fhajny Exp $
 #
 
-RMQ_VERSION=	2.8.2
+RMQ_VERSION=	3.0.4