Updated net/rabbitmq to 2.6.1.

Various pkgsrc fixes:

- Fix mangled PLIST from the previous commit.
- Depend on coreutils for readlink, which is used in rabbitmq-env.
- Depend on bash, which is assumed throughout the scripts.
- Make sure the shell is passed properly to make/install targets.
- Fix Python usage (add Python 2.7) and clean up other bits.

RabbitMQ changelog:

2.6.1 bug fixes
- The broker failed to (re)start on reboot on systems that keep
  /var/run on a temporary file systems, e.g. Ubuntu.
- The Windows service failed to increase the Erlang process limit,
  limiting the broker to a few thousand queues, connections and
  channels.

2.6.0 bug fixes
- Upgrading from RabbitMQ 2.1.1 to any later release could break if
  there were durable queues with persistent messages present.
- On very slow machines, starting rabbit via the supplied init scripts
  could fail with a timeout.
- Rabbit could fail to stop (when asked to do so) in the presence of
  some plug-ins (e.g. shovel).
- 'ram' nodes in a cluster could consume ever increasing amounts of
  disk space.
- The presence of fast consumers on a queue could significantly delay
  the addition of new consumers.
- When a client was issuing a tx.commit in one channel, and
  simultaneously, in another channel, deleted a durable queue with
  persistent messages involved in that tx, rabbit could terminate with
  an error.
- When a client was using both basic.qos and channel.flow, the latter
  would fail to re-enable message flow.
- When using 'confirm' mode, the deletion of queues could cause nacks
  to be issued (incorrectly).
- In extremely rare circumstances (never observed in the wild), a
  queue with a per-queue message ttl could break during sudden changes
  in rabbit memory usage.

2.6.0 enhancements
- Introduce active-active HA, with queues getting mirrored on nodes in
  a cluster. See http://www.rabbitmq.com/ha.html.
- Revamp the handling of AMQP's tx (transaction) class and clarify its
  behaviour See http://www.rabbitmq.com/specification.html#tx.
- Replace the 'administrator' flag, as used by the management plugin,
  with a more general 'user tags' mechanism. See
  http://www.rabbitmq.com/man/rabbitmqctl.1.man.html#set_user_tags.
- Do not require 'configure' permissions for passive queue/exchange
  declaration.
- Optimise of message delivery on channels with a basic.qos
  prefetch limit that are consuming from many queues.
- In 'rabbitmqctl list_channels', do not show the tx mode by default.
- When a cluster 'degrades' to only containing ram nodes - through
  'rabbitmqctl' actions or node failure - display/log a warning.
- Eliminate some spurious errors from the sasl log.

6 files changed, 176 insertions, 146 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index a47ffcb2f35..d776679c508 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/09/21 11:47:32 fhajny Exp $
+# $NetBSD: Makefile,v 1.2 2011/09/29 14:00:39 fhajny Exp $
 #
 
 PKGNAME=		rabbitmq-${RMQ_VERSION}
@@ -13,27 +13,23 @@ LICENSE=		mpl-1.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake bash:run
 
 BUILD_DEPENDS+=		libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=		xmlto-[0-9]*:../../textproc/xmlto
+DEPENDS+=		coreutils-[0-9]*:../../sysutils/coreutils
 DEPENDS+=		${PYPKGPREFIX}-simplejson>=2:../../converters/py-simplejson
 
 .include "version.mk"
 .include "../../lang/python/pyversion.mk"
 
-BUILD_DEFS+=		VARBASE
-
-.if !empty(TOOLS_PLATFORM.bash)
-RMQ_SHELL=		${TOOLS_PLATFORM.bash}
-.else
-RMQ_SHELL=		/bin/sh
-.endif
+BUILD_DEFS+=		VARBASE GNU_PROGRAM_PREFIX
 
 .include		"../../mk/bsd.prefs.mk"
 
 RMQ_USER?=		rabbitmq
 RMQ_GROUP?=		${RMQ_USER}
+RMQ_SHELL?=		${TOOLS_PATH.bash}
 RMQ_DIR?=		${VARBASE}/db/rabbitmq
 RMQ_LOG?=		${VARBASE}/log/rabbitmq
 
@@ -47,7 +43,7 @@ PKG_GECOS.${RMQ_USER}=	RabbitMQ Server User
 PKG_HOME.${RMQ_USER}=	${RMQ_DIR}
 PKG_SHELL.${RMQ_USER}=	${RMQ_SHELL}
 
-PKG_SYSCONFSUBDIR?=	${PKGBASE}
+PKG_SYSCONFSUBDIR=	${PKGBASE}
 CONF_FILES+=		${PREFIX}/share/examples/rabbitmq/rabbitmq.conf ${PKG_SYSCONFDIR}/rabbitmq.conf
 
 INSTALLATION_DIRS+=	share/examples/rabbitmq
@@ -60,26 +56,32 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting standard paths
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	${SCRIPTS_DIR}/rabbitmqctl ${SCRIPTS_DIR}/rabbitmq-env
-SUBST_FILES.paths+=	${SCRIPTS_DIR}/rabbitmq-multi ${SCRIPTS_DIR}/rabbitmq-server
-SUBST_SED.paths=	-e 's|/etc/rabbitmq|${PKG_SYSCONFDIR}/rabbitmq|g'
+SUBST_FILES.paths+=	${SCRIPTS_DIR}/rabbitmq-server
+SUBST_SED.paths=	-e 's|/etc/rabbitmq|${PKG_SYSCONFDIR}|g'
 SUBST_SED.paths+=	-e 's|/var/lib|${VARBASE}/db|g'
 SUBST_SED.paths+=	-e 's|/var/log|${VARBASE}/log|g'
+SUBST_SED.paths+=	-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.paths+=	-e 's|erl|${PREFIX}/bin/erl|g'
 SUBST_SED.paths+=	-e 's|/bin/sh|/bin/ksh|g'
-
-SUBST_CLASSES+=		shell
-SUBST_MESSAGE.shell=	Setting Makefile shell
-SUBST_STAGE.shell=	post-patch
-SUBST_FILES.shell=	Makefile
-SUBST_SED.shell=	-e 's|@SHELL@|${RMQ_SHELL}|g'
+SUBST_SED.paths+=	-e 's|readlink|${PREFIX}/bin/${GNU_PROGRAM_PREFIX}readlink|g'
 
 MAKE_ENV+=		TARGET_DIR="${DESTDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}"
 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}"
+
+INSTALL_ENV+=		TARGET_DIR="${DESTDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}"
+INSTALL_ENV+=		SBIN_DIR="${DESTDIR}${PREFIX}/sbin/"
+INSTALL_ENV+=		MAN_DIR="${DESTDIR}${PREFIX}/man"
+INSTALL_ENV+=		RMQ_VERSION=${RMQ_VERSION}
+INSTALL_ENV+=		MAKE_SHELL="${RMQ_SHELL}"
+
+REPLACE_PYTHON+=	calculate-relative
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/rabbitmq.conf ${DESTDIR}${PREFIX}/share/examples/rabbitmq/rabbitmq.conf
 
 .include "../../lang/erlang/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/rabbitmq/PLIST b/net/rabbitmq/PLIST
index bb31fe8003d..40cf63bbae3 100644
--- a/net/rabbitmq/PLIST
+++ b/net/rabbitmq/PLIST
@@ -1,120 +1,129 @@
-@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
+@comment $NetBSD: PLIST,v 1.3 2011/09/29 14:00:39 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-MPL-RabbitMQ
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/bpqueue.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/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/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/pg2_fixed.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_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_topic.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_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_auth_backend_spec.hrl
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_auth_mechanism_spec.hrl
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_backing_queue_spec.hrl
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_exchange_type_spec.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}/include/rabbit_msg_store_index.hrl
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/README
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmq-env
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmq-server
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmqctl
 man/man1/rabbitmq-server.1
 man/man1/rabbitmqctl.1
-man/man5/rabbitmq-env.conf.5.gz
+man/man5/rabbitmq-env.conf.5
 sbin/rabbitmq-env
 sbin/rabbitmq-server
 sbin/rabbitmqctl
diff --git a/net/rabbitmq/buildlink3.mk b/net/rabbitmq/buildlink3.mk
index 4027943f3ee..ee3c9000dc8 100644
--- a/net/rabbitmq/buildlink3.mk
+++ b/net/rabbitmq/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/09/21 11:47:32 fhajny Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2011/09/29 14:00:39 fhajny Exp $
 
 BUILDLINK_TREE+=			rabbitmq
 
@@ -6,6 +6,7 @@ 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 72a75383c3a..c9494d6e71b 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2011/07/05 13:09:04 mspo Exp $
+$NetBSD: distinfo,v 1.3 2011/09/29 14:00:39 fhajny Exp $
 
-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
+SHA1 (rabbitmq-server-2.6.1.tar.gz) = 628ec7453c0ee8ec3bad0780504e335b48f9b533
+RMD160 (rabbitmq-server-2.6.1.tar.gz) = 818cd8bfbf5593b0cdb4bd4a71d4b7124472f35c
+Size (rabbitmq-server-2.6.1.tar.gz) = 367491 bytes
+SHA1 (patch-aa) = 70d02da132630369cfce53555a0aab614a26c88a
diff --git a/net/rabbitmq/patches/patch-aa b/net/rabbitmq/patches/patch-aa
index 5aee3e9de3b..c99cd063766 100644
--- a/net/rabbitmq/patches/patch-aa
+++ b/net/rabbitmq/patches/patch-aa
@@ -1,10 +1,28 @@
-$NetBSD: patch-aa,v 1.2 2011/07/05 13:09:05 mspo Exp $
+$NetBSD: patch-aa,v 1.3 2011/09/29 14:00:39 fhajny Exp $
 
---- Makefile.orig	2011-07-05 12:03:54.000000000 +0000
+Fix shell and add Python 2.7.
+--- Makefile.orig	2011-02-03 12:47:36.000000000 +0000
 +++ Makefile
-@@ -1,4 +1,5 @@
+@@ -1,3 +1,4 @@
++SHELL=$(MAKE_SHELL)
  TMPDIR ?= /tmp
-+SHELL=@SHELL@
  
  RABBITMQ_NODENAME ?= rabbit
- RABBITMQ_SERVER_START_ARGS ?=
+@@ -24,6 +25,9 @@ USAGES_ERL=$(foreach XML, $(USAGES_XML),
+ ifeq ($(shell python -c 'import simplejson' 2>/dev/null && echo yes),yes)
+ PYTHON=python
+ else
++ifeq ($(shell python2.7 -c 'import simplejson' 2>/dev/null && echo yes),yes)
++PYTHON=python2.7
++else
+ ifeq ($(shell python2.6 -c 'import simplejson' 2>/dev/null && echo yes),yes)
+ PYTHON=python2.6
+ else
+@@ -35,6 +39,7 @@ PYTHON=python
+ endif
+ endif
+ endif
++endif
+ 
+ BASIC_PLT=basic.plt
+ RABBIT_PLT=rabbit.plt
diff --git a/net/rabbitmq/version.mk b/net/rabbitmq/version.mk
index cdb2fd0704d..97dc9db4ffb 100644
--- a/net/rabbitmq/version.mk
+++ b/net/rabbitmq/version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.2 2011/07/05 13:09:04 mspo Exp $
+# $NetBSD: version.mk,v 1.3 2011/09/29 14:00:39 fhajny Exp $
 #
 
-RMQ_VERSION=	2.5.1
+RMQ_VERSION=	2.6.1