Update net/rabbitmq to 3.6.0.

Clean up and simplify Makefile.

Breaking changes in 3.6.0:

- Minimum required Erlang version is R16B03 for plain ("just TCP")
  connections for all protocols and 17.5 for TLS ones (18.x is
  recommended for both).
- .NET client now requires .NET 4.5.
- "Immediate" flag is removed from the .NET client (it hasn't been
  supported by the server since RabbitMQ 3.0).
- Default subscription TTL in MQTT is now 24 hours.
- Server artifacts are now distributed as xz archives and not gz.
- Build system has been completely reworked and now uses erlang.mk.
  3rd party plugins must be adapted to the new build system.

Key improvements in this release are:

- Lazy queues
- Much better queue synchronisation throughput
- Lower RAM use, tunable flow control
- Stronger password encryption with pluggable algorithms
- Development moved to GitHub; build system now uses erlang.mk
- Significant improvements to Web STOMP
- Experimental WinRT-compatible .NET client, SQL CLR compatibility
  in the "regular" one
- Pagination in management UI
- More popular plugins now ship with the broker: rabbitmq_sharding
  and rabbitmq_event_exchange, for example.

Full release notes:

  https://github.com/rabbitmq/rabbitmq-server/releases/tag/rabbitmq_v3_6_0

9 files changed, 95 insertions, 159 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 00d7637e9e5..c84895721c6 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,30 +1,23 @@
-# $NetBSD: Makefile,v 1.22 2015/12/05 21:25:55 adam Exp $
+# $NetBSD: Makefile,v 1.23 2015/12/31 22:16:33 fhajny Exp $
 
-PKGNAME=		rabbitmq-${RMQ_VERSION}
-DISTNAME=		rabbitmq-server-${RMQ_VERSION}
-PKGREVISION=		1
+DISTNAME=		rabbitmq-server-3.6.0
+PKGNAME=		${DISTNAME:S/-server//}
 CATEGORIES=		net
-MASTER_SITES=		http://www.rabbitmq.com/releases/rabbitmq-server/v${RMQ_VERSION}/
+MASTER_SITES=		http://www.rabbitmq.com/releases/rabbitmq-server/v${PKGVERSION_NOREV}/
+EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		filip@joyent.com
 HOMEPAGE=		http://www.rabbitmq.com/server.html
 COMMENT=		Implementation of AMQP that provides robust messaging for applications
 LICENSE=		mpl-1.1
 
-USE_TOOLS+=		bash:run coreutils gmake unzip zip
-
-MAKE_JOBS_SAFE=		no
+USE_TOOLS+=		bash:run gmake unzip zip
 
 BUILD_DEPENDS+=		libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 BUILD_DEPENDS+=		xmlto-[0-9]*:../../textproc/xmlto
 DEPENDS+=		${PYPKGPREFIX}-simplejson>=2:../../converters/py-simplejson
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # not yet ported as of 3.2.2
-
-.include "version.mk"
-.include "../../lang/python/pyversion.mk"
-
 BUILD_DEFS+=		VARBASE
 
 .include		"../../mk/bsd.prefs.mk"
@@ -35,7 +28,6 @@ RMQ_SHELL?=		${TOOLS_PATH.bash}
 RMQ_DIR?=		${VARBASE}/db/rabbitmq
 RMQ_LOG?=		${VARBASE}/log/rabbitmq
 
-OWN_DIRS+=		${RMQ_DIR} ${RMQ_LOG}
 OWN_DIRS_PERMS+=	${RMQ_DIR} ${RMQ_USER} ${RMQ_GROUP} 0770
 OWN_DIRS_PERMS+=	${RMQ_LOG} ${RMQ_USER} ${RMQ_GROUP} 0770
 
@@ -55,17 +47,15 @@ FILES_SUBST+=		RMQ_USER=${RMQ_USER}
 FILES_SUBST+=		RMQ_GROUP=${RMQ_GROUP}
 FILES_SUBST+=		RMQ_DIR=${RMQ_DIR}
 
-RABBITMQ_HOME=		${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}
+RABBITMQ_HOME=		${PREFIX}/lib/erlang/lib/rabbitmq_server-${PKGVERSION_NOREV}
 
 INSTALLATION_DIRS+=	share/examples/rabbitmq
 
 SCRIPTS_DIR=		${WRKSRC}/scripts
 
-PLIST_SUBST+=		RMQ_VERSION=${RMQ_VERSION}
-
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting standard paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-build
 SUBST_FILES.paths=	${SCRIPTS_DIR}/rabbitmqctl ${SCRIPTS_DIR}/rabbitmq-env
 SUBST_FILES.paths+=	${SCRIPTS_DIR}/rabbitmq-plugins ${SCRIPTS_DIR}/rabbitmq-server
 SUBST_FILES.paths+=	${SCRIPTS_DIR}/rabbitmq-defaults
@@ -81,20 +71,17 @@ REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-env
 REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-plugins
 REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-server
 
-MAKE_ENV+=		TARGET_DIR="${DESTDIR}${RABBITMQ_HOME}"
-MAKE_ENV+=		SBIN_DIR="${DESTDIR}${PREFIX}/sbin/"
-MAKE_ENV+=		MAN_DIR="${DESTDIR}${PREFIX}/man"
-MAKE_ENV+=		DOC_INSTALL_DIR="${DESTDIR}${PREFIX}/share/examples/rabbitmq"
-MAKE_ENV+=		RMQ_VERSION=${RMQ_VERSION}
-MAKE_ENV+=		MAKE_SHELL="${RMQ_SHELL}"
-MAKE_ENV+=		GIT_SSL_NO_VERIFY=true
+MAKE_ENV+=		MANDIR="${PREFIX}/${PKGMANDIR}"
+MAKE_ENV+=		RMQ_BINDIR="${PREFIX}/sbin"
+MAKE_ENV+=		RMQ_LIBDIR="${PREFIX}/lib/erlang/lib"
 
-REPLACE_PYTHON+=	calculate-relative
-REPLACE_PYTHON+=	plugins-src/rabbitmq-amqp1.0/codegen.py
+INSTALL_TARGET=		install-erlapp install-scripts install-bin install-man
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/docs/rabbitmq.config.example		\
+		${DESTDIR}${PREFIX}/share/examples/rabbitmq
 	${INSTALL_DATA} ${FILESDIR}/rabbitmq-env.conf 				\
-		${DESTDIR}${PREFIX}/share/examples/rabbitmq/rabbitmq-env.conf
+		${DESTDIR}${PREFIX}/share/examples/rabbitmq
 
 .include "../../lang/erlang/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/net/rabbitmq/PLIST b/net/rabbitmq/PLIST
index 24f9121bd9b..dd79ea8a508 100644
--- a/net/rabbitmq/PLIST
+++ b/net/rabbitmq/PLIST
@@ -1,69 +1,54 @@
-@comment $NetBSD: PLIST,v 1.19 2015/09/25 07:17:37 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.20 2015/12/31 22:16:33 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-Rebar
 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-EPL-OTP
 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-Mochiweb
 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-SockJS
 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}/LICENSE-MPL2
 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/file_handle_cache_stats.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/lqueue.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/mirrored_supervisor.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/mirrored_supervisor_sups.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_amqqueue_sup_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_app.in
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_auth_backend_dummy.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_authn_backend.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_authz_backend.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_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_interceptor.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_boot_steps.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_cli.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_helper_sup.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_connection_sup.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_control_main.beam
@@ -75,10 +60,7 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_disk_monitor.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_epmd_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
@@ -86,10 +68,8 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_type_invalid.b
 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_hipe.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
@@ -102,38 +82,38 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_mode_exact
 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_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_mnesia_rename.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_password.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_password_hashing_md5.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_password_hashing_sha256.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_password_hashing_sha512.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_policies.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_prequeue.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_priority_queue.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_collector.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_consumers.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_decorator.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_queue_location_client_local.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_location_min_masters.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_location_random.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_location_validator.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_master_location_misc.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_recovery_terms.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_registry.beam
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_resource_monitor_misc.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_sasl_report_file_h.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_ssl.beam
@@ -147,15 +127,9 @@ 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/ssl_compat.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/supervised_lifecycle.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_listener.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/tcp_listener_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/time_compat.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/truncate.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/vm_memory_monitor.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/worker_pool.beam
@@ -168,29 +142,33 @@ 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-${PKGVERSION}.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/cowboy-0.5.0-rmq${PKGVERSION}-git4b93c2d.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/eldap-${PKGVERSION}-gite309de4.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/mochiweb-2.7.0-rmq${PKGVERSION}-git680dba8.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/cowboy-1.0.3.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/cowlib-1.0.1.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/mochiweb-2.13.0.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbit_common-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_amqp1_0-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_auth_backend_ldap-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_auth_mechanism_ssl-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_consistent_hash_exchange-${PKGVERSION}.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_event_exchange-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_federation-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_federation_management-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_management-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_management_agent-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_management_visualiser-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_mqtt-${PKGVERSION}.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_recent_history_exchange-1.2.1.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_sharding-0.1.0.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_shovel-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_shovel_management-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_stomp-${PKGVERSION}.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_test-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_tracing-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_web_dispatch-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_web_stomp-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_web_stomp_examples-${PKGVERSION}.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/sockjs-0.3.4-rmq${PKGVERSION}-git3132eb9.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/webmachine-1.10.3-rmq${PKGVERSION}-gite9359c7.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/ranch-1.2.1.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/sockjs-0.3.4.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/webmachine-git.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
diff --git a/net/rabbitmq/buildlink3.mk b/net/rabbitmq/buildlink3.mk
deleted file mode 100644
index f537ba14d19..00000000000
--- a/net/rabbitmq/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2013/04/02 10:40:36 fhajny Exp $
-
-BUILDLINK_TREE+=			rabbitmq
-
-.if !defined(RABBITMQ_BUILDLINK3_MK)
-RABBITMQ_BUILDLINK3_MK:=
-
-.include "version.mk"
-BUILDLINK_API_DEPENDS.rabbitmq+=	rabbitmq>=2.1.0
-BUILDLINK_PKGSRCDIR.rabbitmq?=		../../net/rabbitmq
-
-BUILDLINK_INCDIRS.rabbitmq?=		lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include
-.endif	# RABBITMQ_BUILDLINK3_MK
-
-BUILDLINK_TREE+=			-rabbitmq
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 41fa1f74e9e..77f7a4e8269 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.27 2015/11/20 12:26:21 fhajny Exp $
+$NetBSD: distinfo,v 1.28 2015/12/31 22:16:33 fhajny Exp $
 
-SHA1 (rabbitmq-server-3.5.6.tar.gz) = 51543b70ab913fcec088257265d0e112b4d8b019
-RMD160 (rabbitmq-server-3.5.6.tar.gz) = 2fb2531f1c5aeb04f760d1e79394aa7eee9beae9
-SHA512 (rabbitmq-server-3.5.6.tar.gz) = e346d84b2ea4af3004e3906c99d82bef40283f0d5e2ca4e5fa31b5b8e417534ca3b8cc80218702a535510d3ab1ae547d11ae688e4ca6fa9d51bdd91dda56abd0
-Size (rabbitmq-server-3.5.6.tar.gz) = 3747595 bytes
-SHA1 (patch-aa) = 615aa7cb9775655ca5b3aaa392d51fbf1ab7083e
-SHA1 (patch-plugins-src_do-package.mk) = c1f4a6422a9cb7bac4e1d6bdb671a87a16f73764
-SHA1 (patch-scripts_rabbitmq-env) = bd6608096f5e52693b9491e161116a92e00fb331
+SHA1 (rabbitmq-server-3.6.0.tar.xz) = 5f9993fba1f0b95ffd22c3ed639fa423e2255103
+RMD160 (rabbitmq-server-3.6.0.tar.xz) = 6bf6ddd3838d7105319bc63ada48e3e9bfed01eb
+SHA512 (rabbitmq-server-3.6.0.tar.xz) = 5ed5cd9fc0092e4cfc8187f38143ce9b43c12fa48595ca84e650dd696fae120e405593a15e5832f05fc80bd15525841f6e60dfdc5e9fc8f42397ae66d78d6bf9
+Size (rabbitmq-server-3.6.0.tar.xz) = 2928768 bytes
+SHA1 (patch-Makefile) = 088a3ed04dc72215f1ca3b34b49bb4047a531e89
+SHA1 (patch-scripts_rabbitmq-env) = 0b94c8b3987408b7a6291e3797f9d0e31fca64d6
diff --git a/net/rabbitmq/patches/patch-Makefile b/net/rabbitmq/patches/patch-Makefile
new file mode 100644
index 00000000000..8bd5e4f021d
--- /dev/null
+++ b/net/rabbitmq/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2015/12/31 22:16:33 fhajny Exp $
+
+Use absolute paths for the sbin links.
+
+--- Makefile.orig	2015-12-21 16:52:25.000000000 +0000
++++ Makefile
+@@ -380,7 +380,7 @@ install-bin: install-scripts
+ 	$(verbose) mkdir -p $(DESTDIR)$(RMQ_BINDIR)
+ 	$(inst_verbose) for script in $(SCRIPTS); do \
+ 		test -e $(DESTDIR)$(RMQ_BINDIR)/$$script || \
+-			ln -sf ../lib/$(notdir $(RMQ_ERLAPP_DIR))/sbin/$$script \
++			ln -sf $(RMQ_ERLAPP_DIR)/sbin/$$script \
+ 			 $(DESTDIR)$(RMQ_BINDIR)/$$script; \
+ 	done
+ 
diff --git a/net/rabbitmq/patches/patch-aa b/net/rabbitmq/patches/patch-aa
deleted file mode 100644
index dd789a3a976..00000000000
--- a/net/rabbitmq/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2015/08/26 01:17:11 fhajny Exp $
-
-Support for Python 2.7, drop dependency on gsed.
---- Makefile.orig	2015-07-21 19:37:21.000000000 +0000
-+++ Makefile
-@@ -1,3 +1,4 @@
-+SHELL=$(MAKE_SHELL)
- TMPDIR ?= /tmp
- 
- RABBITMQ_NODENAME ?= rabbit
diff --git a/net/rabbitmq/patches/patch-plugins-src_do-package.mk b/net/rabbitmq/patches/patch-plugins-src_do-package.mk
deleted file mode 100644
index 304a396add3..00000000000
--- a/net/rabbitmq/patches/patch-plugins-src_do-package.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins-src_do-package.mk,v 1.1 2014/01/13 12:10:23 fhajny Exp $
-
-Fix module versioning with gmake<4.
---- plugins-src/do-package.mk.orig	2013-12-10 16:18:44.000000000 +0000
-+++ plugins-src/do-package.mk
-@@ -545,7 +545,7 @@ $(PACKAGE_DIR)/dist/.done: $(PACKAGE_DIR
- # makefile.
- $(PACKAGE_DIR)/dist/.done.$(VERSION): $(PACKAGE_DIR)/Makefile $(wildcard $(PACKAGE_DIR)/*.mk) $(wildcard $(PACKAGE_DIR)/src/*.erl) $(wildcard $(PACKAGE_DIR)/include/*.hrl) $(wildcard $(PACKAGE_DIR)/*.py) $(foreach DEP,$(NON_INTEGRATED_DEPS_$(PACKAGE_DIR)),$(call package_to_path,$(DEP))/dist/.done)
- 	rm -rf $$(@D)
--	$$(MAKE) -C $(PACKAGE_DIR)
-+	$$(MAKE) -C $(PACKAGE_DIR) VERSION=$(VERSION)
- 	mkdir -p $$(@D)
- 	touch $$@
- 
diff --git a/net/rabbitmq/patches/patch-scripts_rabbitmq-env b/net/rabbitmq/patches/patch-scripts_rabbitmq-env
index d818498e11d..db93d46c11a 100644
--- a/net/rabbitmq/patches/patch-scripts_rabbitmq-env
+++ b/net/rabbitmq/patches/patch-scripts_rabbitmq-env
@@ -1,37 +1,37 @@
-$NetBSD: patch-scripts_rabbitmq-env,v 1.1 2015/11/20 12:26:21 fhajny Exp $
+$NetBSD: patch-scripts_rabbitmq-env,v 1.2 2015/12/31 22:16:33 fhajny Exp $
 
 Remove cumbersome symlink handling, we know where stuff is.
 
---- scripts/rabbitmq-env.orig	2015-10-07 12:45:15.000000000 +0000
+--- scripts/rabbitmq-env.orig	2015-11-12 16:42:49.000000000 +0000
 +++ scripts/rabbitmq-env
-@@ -15,29 +15,7 @@
- ##  Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
- ##
+@@ -20,29 +20,7 @@ if [ "$RABBITMQ_ENV_LOADED" = 1 ]; then
+ fi
  
--# We set +e here since since our test for "readlink -f" below needs to
--# be able to fail.
--set +e
--# Determine where this script is really located (if this script is
--# invoked from another script, this is the location of the caller)
--SCRIPT_PATH="$0"
--while [ -h "$SCRIPT_PATH" ] ; do
--    # Determine if readlink -f is supported at all. TODO clean this up.
--    FULL_PATH=`readlink -f $SCRIPT_PATH 2>/dev/null`
--    if [ "$?" != "0" ]; then
--      REL_PATH=`readlink $SCRIPT_PATH`
--      if expr "$REL_PATH" : '/.*' > /dev/null; then
--        SCRIPT_PATH="$REL_PATH"
--      else
--        SCRIPT_PATH="`dirname "$SCRIPT_PATH"`/$REL_PATH"
--      fi
--    else
--      SCRIPT_PATH=$FULL_PATH
--    fi
--done
--set -e
+ if [ -z "$RABBITMQ_SCRIPTS_DIR" ]; then
+-    # We set +e here since since our test for "readlink -f" below needs to
+-    # be able to fail.
+-    set +e
+-    # Determine where this script is really located (if this script is
+-    # invoked from another script, this is the location of the caller)
+-    SCRIPT_PATH="$0"
+-    while [ -h "$SCRIPT_PATH" ] ; do
+-        # Determine if readlink -f is supported at all. TODO clean this up.
+-        FULL_PATH=`readlink -f $SCRIPT_PATH 2>/dev/null`
+-        if [ "$?" != "0" ]; then
+-          REL_PATH=`readlink $SCRIPT_PATH`
+-          if expr "$REL_PATH" : '/.*' > /dev/null; then
+-            SCRIPT_PATH="$REL_PATH"
+-          else
+-            SCRIPT_PATH="`dirname "$SCRIPT_PATH"`/$REL_PATH"
+-          fi
+-        else
+-          SCRIPT_PATH=$FULL_PATH
+-        fi
+-    done
+-    set -e
 -
--SCRIPT_DIR=`dirname $SCRIPT_PATH`
-+SCRIPT_DIR="@RABBITMQ_HOME@/sbin"
- RABBITMQ_HOME="${SCRIPT_DIR}/.."
+-    RABBITMQ_SCRIPTS_DIR=`dirname $SCRIPT_PATH`
++    RABBITMQ_SCRIPTS_DIR="@RABBITMQ_HOME@/sbin"
+ fi
  
- ## Set defaults
+ rmq_realpath() {
diff --git a/net/rabbitmq/version.mk b/net/rabbitmq/version.mk
deleted file mode 100644
index ead0727b670..00000000000
--- a/net/rabbitmq/version.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: version.mk,v 1.23 2015/10/18 21:05:50 fhajny Exp $
-#
-
-RMQ_VERSION=	3.5.6