Upgrade from 2.1.0 -> latest (2.5.1). Also fixes build.

---
Release messages:
The RabbitMQ team is pleased to announce the release of RabbitMQ 2.1.1.
This release fixes a number of bugs and introduces some enhancements,
including exchange to exchange bindings and some performance improvements,
in the server and clients.

The RabbitMQ team is pleased to announce the release of RabbitMQ 2.2.0.
This release fixes a number of bugs and introduces some enhancements,
including automatic upgrades of non-clustered brokers, per-queue message
TTLs and significantly reduced memory usage for pending acknowledgements.

Perfectly timed one day before the start of the year of the Rabbit,
the RabbitMQ team is pleased to announce the release of RabbitMQ 2.3.0.
This release fixes a number of bugs and introduces some enhancements,
including streaming publish confirmations, new plugin mechanisms for
authentication and authorisation, and a great deal more.

The RabbitMQ team is pleased to announce the release of RabbitMQ 2.3.1.
This release fixes a small number of bugs, in particular one serious bug
in 2.3.0 which could lead to queue processes crashing.

The RabbitMQ team is delighted to announce the release of RabbitMQ 2.4.0.
This release fixes a number of bugs and introduces some enhancements,
including fast routing for topic exchanges, sender-selected distribution
and server-side consumer cancellation notifications.

The RabbitMQ team is delighted to announce the release of RabbitMQ 2.4.1.
This release fixes a number of bugs, in particular one bug in 2.4.0 that
would break upgrades if durable queues were present. A notable enhancement
included in this release are cluster upgrades.

The RabbitMQ team is delighted to announce the release of RabbitMQ 2.5.0.
This release fixes a number of bugs. In particular:
recovery has been simplified, improving startup times when many exchanges
or bindings exist
bindings are recovered between durable queues and non-durable exchanges
on restart of individual cluster nodes
better performance under high load and memory pressure
source compatibility with the new Erlang R14B03 release
New features include:
tracing facility for debugging incoming and outgoing messages, (see firehose)
improved inbound network performance
improved routing performance
new rabbitmqctl commands ('report', 'environment', and 'cluster_status')

The RabbitMQ team is pleased to announce the release of RabbitMQ 2.5.1.
This release correctly upgrades from RabbitMQ 2.1.1 and 2.2.0.
There are no other changes compared with 2.5.0.

4 files changed, 127 insertions, 116 deletions

diff --git a/net/rabbitmq/PLIST b/net/rabbitmq/PLIST
index 115ef5cf115..bb31fe8003d 100644
--- a/net/rabbitmq/PLIST
+++ b/net/rabbitmq/PLIST
@@ -1,108 +1,121 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/09/21 11:47:32 fhajny Exp $
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/INSTALL
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MPL-RabbitMQ
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/bpqueue.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/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/pg_local.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_backing_queue.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_connection_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_control.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_ctl_usage.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_dialyzer.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_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_registry.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_type_topic.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_framing_channel.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_invariable_queue.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_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_multi.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_multi_usage.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_persister.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_plugin_activator.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_restartable_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_router.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_sasl_report_file_h.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_sup.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_types.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_variable_queue.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/tcp_acceptor.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/tcp_acceptor_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/tcp_client_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/rabbit.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit_backing_queue_spec.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit_exchange_type_spec.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}/include/rabbit_msg_store_index.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/README
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-env
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-multi
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-server
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmqctl
-man/man1/rabbitmq-multi.1
+@comment $NetBSD: PLIST,v 1.2 2011/07/05 13:09:04 mspo Exp $
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/INSTALL
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/LICENSE
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/LICENSE-MPL-RabbitMQ
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/bpqueue.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/delegate.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/delegate_sup.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/file_handle_cache.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/gatherer.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/gen_server2.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/gm.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/gm_soak_test.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/gm_speed_test.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/gm_tests.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/pg_local.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/priority_queue.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit.app
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_access_control.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_alarm.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_amqqueue.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_amqqueue_process.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_amqqueue_sup.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_app.in
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_auth_backend.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_auth_backend_internal.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_auth_mechanism.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_auth_mechanism_amqplain.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_auth_mechanism_cr_demo.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_auth_mechanism_plain.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_backing_queue.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_basic.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_binary_generator.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_binary_parser.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_binding.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_channel.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_channel_sup.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_channel_sup_sup.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_client_sup.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_command_assembler.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_connection_sup.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_control.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_ctl_usage.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_direct.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_error_logger.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_error_logger_file_h.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_event.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_exchange.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_exchange_type.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_exchange_type_direct.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_exchange_type_fanout.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_exchange_type_headers.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_exchange_type_topic.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_framing.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_framing_amqp_0_8.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_framing_amqp_0_9_1.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_guid.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_heartbeat.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_limiter.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_log.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_memory_monitor.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_misc.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_mnesia.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_msg_file.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_msg_store.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_msg_store_ets_index.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_msg_store_gc.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_msg_store_index.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_net.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_networking.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_node_monitor.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_prelaunch.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_queue_collector.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_queue_index.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_reader.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_registry.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_restartable_sup.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_router.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_sasl_report_file_h.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_ssl.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_sup.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_tests.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_tests_event_receiver.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_trace.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_types.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_upgrade.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_upgrade_functions.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_variable_queue.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_version.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_vhost.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_writer.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/supervisor2.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/tcp_acceptor.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/tcp_acceptor_sup.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/tcp_listener.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/tcp_listener_sup.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/test_sup.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/vm_memory_monitor.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/worker_pool.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/worker_pool_sup.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/worker_pool_worker.beam
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/gm_specs.hrl
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit.hrl
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit_auth_backend_spec.hrl
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit_auth_mechanism_spec.hrl
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit_backing_queue_spec.hrl
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit_exchange_type_spec.hrl
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit_framing.hrl
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit_msg_store.hrl
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit_msg_store_index.hrl
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/plugins/README
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/sbin/rabbitmq-env
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/sbin/rabbitmq-server
+lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/sbin/rabbitmqctl
 man/man1/rabbitmq-server.1
 man/man1/rabbitmqctl.1
-man/man5/rabbitmq.conf.5
+man/man5/rabbitmq-env.conf.5.gz
 sbin/rabbitmq-env
-sbin/rabbitmq-multi
 sbin/rabbitmq-server
 sbin/rabbitmqctl
 share/examples/rabbitmq/rabbitmq.conf
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 231ee0505bc..72a75383c3a 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/09/21 11:47:32 fhajny Exp $
+$NetBSD: distinfo,v 1.2 2011/07/05 13:09:04 mspo Exp $
 
-SHA1 (rabbitmq-server-2.1.0.tar.gz) = 8cfff94a4685b645d0d14026b7df8e51ce414bd1
-RMD160 (rabbitmq-server-2.1.0.tar.gz) = 7c447b47774f27c86efb3f8958b12cc7cff20ead
-Size (rabbitmq-server-2.1.0.tar.gz) = 275559 bytes
-SHA1 (patch-aa) = fba22078d70168586321b36f7a7eefe6dfd5d134
+SHA1 (rabbitmq-server-2.5.1.tar.gz) = 25a14f4bb931b0772f0001b4b6e0c3e12d936593
+RMD160 (rabbitmq-server-2.5.1.tar.gz) = d2e2e5e2f0c88afceb5c56cda088340b6e624ad3
+Size (rabbitmq-server-2.5.1.tar.gz) = 332560 bytes
+SHA1 (patch-aa) = 09f8353228a78e314b212fdbd82bccf3cf300e20
diff --git a/net/rabbitmq/patches/patch-aa b/net/rabbitmq/patches/patch-aa
index aecbc3de928..5aee3e9de3b 100644
--- a/net/rabbitmq/patches/patch-aa
+++ b/net/rabbitmq/patches/patch-aa
@@ -1,12 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/09/21 11:47:32 fhajny Exp $
+$NetBSD: patch-aa,v 1.2 2011/07/05 13:09:05 mspo Exp $
 
-Makefile really expects Bash to be used for shell calls
-
---- Makefile.orig	2009-10-06 14:45:47.000000000 +0000
+--- Makefile.orig	2011-07-05 12:03:54.000000000 +0000
 +++ Makefile
-@@ -1,4 +1,4 @@
--
-+SHELL=@SHELL@
+@@ -1,4 +1,5 @@
  TMPDIR ?= /tmp
++SHELL=@SHELL@
  
  RABBITMQ_NODENAME ?= rabbit
+ RABBITMQ_SERVER_START_ARGS ?=
diff --git a/net/rabbitmq/version.mk b/net/rabbitmq/version.mk
index e6930cfa61c..cdb2fd0704d 100644
--- a/net/rabbitmq/version.mk
+++ b/net/rabbitmq/version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.1.1.1 2010/09/21 11:47:32 fhajny Exp $
+# $NetBSD: version.mk,v 1.2 2011/07/05 13:09:04 mspo Exp $
 #
 
-RMQ_VERSION=	2.1.0
+RMQ_VERSION=	2.5.1