- Update to 2.0.0

PR:		ports/150168
Submitted by:	Phillip Neumann <pneumann@gmail.com> (maintainer)

5 files changed, 45 insertions, 27 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 29c719d9a253..d5c11084addc 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rabbitmq
-PORTVERSION=	1.8.0
+PORTVERSION=	2.0.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
@@ -17,14 +17,13 @@ COMMENT=	RabbitMQ is an implementation of AMQP
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang-lite \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson \
 		xmlto:${PORTSDIR}/textproc/xmlto
-RUN_DEPENDS=	erlc:${PORTSDIR}/lang/erlang-lite
+RUN_DEPENDS=	erlc:${PORTSDIR}/lang/erlang-lite \
+		sudo:${PORTSDIR}/security/sudo
 
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_RC_SUBR=	rabbitmq
 
-MANUAL_PACKAGE_BUILD=	erlang beam.smp hangs on pointyhat
-
 RABBITMQ_GID=	135
 RABBITMQ_GROUP=	rabbitmq
 RABBITMQ_UID=	135
@@ -38,8 +37,7 @@ SUB_LIST=	RABBITMQ_GID=${RABBITMQ_GID} \
 		RABBITMQ_UID=${RABBITMQ_UID} \
 		RABBITMQ_USER=${RABBITMQ_USER}
 
-MAN1=		rabbitmq-multi.1 rabbitmq-server.1 rabbitmqctl.1 \
-		rabbitmq-activate-plugins.1 rabbitmq-deactivate-plugins.1
+MAN1=		rabbitmq-multi.1 rabbitmq-server.1 rabbitmqctl.1
 MAN5=		rabbitmq.conf.5
 MANCOMPRESSED=	yes
 
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 72469876aabf..c54a805747d0 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,3 +1,3 @@
-MD5 (rabbitmq-server-1.8.0.tar.gz) = e00bea375e81d51600b5b14220c64d89
-SHA256 (rabbitmq-server-1.8.0.tar.gz) = ccb64d1ea0823a0e143444b8888f86b625bd6907f0625c9f7cd28da1d029d8d8
-SIZE (rabbitmq-server-1.8.0.tar.gz) = 202386
+MD5 (rabbitmq-server-2.0.0.tar.gz) = 04b99018085d4156b404d56377fc1c62
+SHA256 (rabbitmq-server-2.0.0.tar.gz) = 68ec7d210e3a379696538f09322d1c8161066dbcb2a8822ffbfed068b7c9bc7f
+SIZE (rabbitmq-server-2.0.0.tar.gz) = 272752
diff --git a/net/rabbitmq/files/patch-rabbitmqctl b/net/rabbitmq/files/patch-rabbitmqctl
index 620d1f4c73ca..b09f644c4967 100644
--- a/net/rabbitmq/files/patch-rabbitmqctl
+++ b/net/rabbitmq/files/patch-rabbitmqctl
@@ -1,20 +1,16 @@
---- scripts/rabbitmqctl.orig	2010-07-08 17:14:15.000000000 -0400
-+++ scripts/rabbitmqctl	2010-07-08 17:15:01.000000000 -0400
-@@ -38,13 +38,13 @@
+--- scripts/rabbitmqctl.orig	2010-08-24 11:19:27.000000000 -0400
++++ scripts/rabbitmqctl	2010-08-31 17:58:01.000000000 -0400
+@@ -38,7 +38,7 @@
  [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
  [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
  
 -exec erl \
--    -pa "${RABBITMQ_HOME}/ebin" \
-+cmd="exec erl \
-+    -pa '${RABBITMQ_HOME}/ebin' \
++sudo -u rabbitmq HOME=/var/db/rabbitmq erl \
+     -pa "${RABBITMQ_HOME}/ebin" \
      -noinput \
      -hidden \
-     ${RABBITMQ_CTL_ERL_ARGS} \
-     -sname rabbitmqctl$$ \
+@@ -47,4 +47,3 @@
      -s rabbit_control \
      -nodename $RABBITMQ_NODENAME \
--    -extra "$@"
+     -extra "$@"
 -	
-+    -extra '$@' "
-+env HOME=/var/db/rabbitmq su -m rabbitmq -c "${cmd}"
diff --git a/net/rabbitmq/files/patch-src-rabbitmulti.erl b/net/rabbitmq/files/patch-src-rabbitmulti.erl
new file mode 100644
index 000000000000..e3819c9bc63b
--- /dev/null
+++ b/net/rabbitmq/files/patch-src-rabbitmulti.erl
@@ -0,0 +1,11 @@
+--- src/rabbit_multi.erl.orig	2010-08-31 18:06:58.000000000 -0400
++++ src/rabbit_multi.erl	2010-08-31 18:07:09.000000000 -0400
+@@ -303,7 +303,7 @@
+ is_dead(Pid) ->
+     PidS = integer_to_list(Pid),
+     with_os([{unix, fun () ->
+-                            Res = os:cmd("ps --no-headers --pid " ++ PidS),
++                            Res = os:cmd("ps " ++ PidS ++ " |grep -v PID"),
+                             Res == ""
+                     end},
+              {win32, fun () ->
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index 12f8de575e24..cedc7e036884 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -1,5 +1,3 @@
-sbin/rabbitmq-activate-plugins
-sbin/rabbitmq-deactivate-plugins
 sbin/rabbitmq-env
 sbin/rabbitmq-multi
 sbin/rabbitmq-server
@@ -7,9 +5,11 @@ sbin/rabbitmqctl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/INSTALL
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MPL-RabbitMQ
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/bpqueue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/delegate.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/delegate_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/file_handle_cache.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gatherer.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gen_server2.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg_local.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/priority_queue.beam
@@ -38,7 +38,9 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_fanout.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_headers.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_registry.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_topic.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_event.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_amqp_0_8.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_amqp_0_9_1.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_channel.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_guid.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_heartbeat.beam
@@ -52,19 +54,28 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_misc.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mnesia.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_multi.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_multi_usage.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_file.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store_ets_index.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store_gc.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store_index.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_net.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_networking.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_node_monitor.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_persister.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugin_activator.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_collector.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_index.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_reader.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_reader_queue_collector.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_restartable_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_router.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sasl_report_file_h.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_tests.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_tests_event_receiver.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_tracer.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_types.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_variable_queue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_writer.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervisor2.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_acceptor.beam
@@ -72,6 +83,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_acceptor_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_client_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener_sup.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/test_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/vm_memory_monitor.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool_sup.beam
@@ -80,13 +92,14 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_backing_queue_spec.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_exchange_type_spec.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_framing.hrl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_framing_spec.hrl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-activate-plugins
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-deactivate-plugins
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_msg_store.hrl
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_msg_store_index.hrl
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/README
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-env
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-multi
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-server
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmqctl
+@dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins
 @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/include
 @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin
 @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin