Update to 1.8.0

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

5 files changed, 53 insertions, 30 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 5caaebfef0e4..06276de92d27 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rabbitmq
-PORTVERSION=	1.7.0
+PORTVERSION=	1.8.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
@@ -15,7 +15,8 @@ MAINTAINER=	pneumann@gmail.com
 COMMENT=	RabbitMQ is an implementation of AMQP
 
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang-lite \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson \
+		xmlto:${PORTSDIR}/textproc/xmlto
 RUN_DEPENDS=	erlc:${PORTSDIR}/lang/erlang-lite
 
 USE_GMAKE=	yes
@@ -29,7 +30,7 @@ RABBITMQ_USER=	rabbitmq
 
 PLIST_SUB=	"VERSION=${PORTVERSION}"
 
-SUB_FILES=	pkg-install pkg-message
+SUB_FILES=	pkg-install
 SUB_LIST=	RABBITMQ_GID=${RABBITMQ_GID} \
 		RABBITMQ_GROUP=${RABBITMQ_GROUP} \
 		RABBITMQ_UID=${RABBITMQ_UID} \
@@ -56,10 +57,7 @@ pre-install:
 	@${FIND} ${WRKSRC}/ebin ${WRKSRC}/include -type f | \
 		${XARGS} ${CHMOD} 0644
 
-# TODO: Wrap control scripts to use ${RABBITMQ_USER} via su, much like
-# the installed rc.d script, for user convenience.
 post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 61534bbd2947..72469876aabf 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,3 +1,3 @@
-MD5 (rabbitmq-server-1.7.0.tar.gz) = 4505ca0fd8718439bd6f5e2af2379e56
-SHA256 (rabbitmq-server-1.7.0.tar.gz) = a73c25ff0e725a2b9afb37e3796ad46c32f5f6c097091f6c0e40ccc878db9e4a
-SIZE (rabbitmq-server-1.7.0.tar.gz) = 143252
+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
diff --git a/net/rabbitmq/files/patch-rabbitmqctl b/net/rabbitmq/files/patch-rabbitmqctl
new file mode 100644
index 000000000000..620d1f4c73ca
--- /dev/null
+++ b/net/rabbitmq/files/patch-rabbitmqctl
@@ -0,0 +1,20 @@
+--- 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 @@
+ [ "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' \
+     -noinput \
+     -hidden \
+     ${RABBITMQ_CTL_ERL_ARGS} \
+     -sname rabbitmqctl$$ \
+     -s rabbit_control \
+     -nodename $RABBITMQ_NODENAME \
+-    -extra "$@"
+-	
++    -extra '$@' "
++env HOME=/var/db/rabbitmq su -m rabbitmq -c "${cmd}"
diff --git a/net/rabbitmq/files/pkg-message.in b/net/rabbitmq/files/pkg-message.in
deleted file mode 100644
index 6678185bc221..000000000000
--- a/net/rabbitmq/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-
-##############################################################################
-
-Please note:
-The "rabbitmqctl" command must be run as the %%RABBITMQ_USER%% user,
-with a real shell, and with the ${HOME} environment variable set to that
-user's real home directory.
-
-su users can do something like this:
- # env HOME=/home/%%RABBITMQ_USER%% su -m %%RABBITMQ_USER%% -c 'rabbitmqctl ...'
-
-sudo users can do something like this:
- # sudo -H -u %%RABBITMQ_USER%% rabbitmqctl ...
-
-##############################################################################
-
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index 5c61b06f4235..12f8de575e24 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -7,7 +7,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/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/gen_server2.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg_local.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/priority_queue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.app
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.beam
@@ -17,47 +21,64 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_process.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_app.in
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_backing_queue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_basic.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binary_generator.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binary_parser.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_control.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ctl_usage.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_dialyzer.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_error_logger.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_error_logger_file_h.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_guid.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_hooks.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_direct.beam
+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_framing_channel.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_guid.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_heartbeat.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_hooks.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_invariable_queue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_limiter.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_load.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_log.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memsup.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memsup_darwin.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memsup_linux.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memory_monitor.beam
 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_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_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_tracer.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
 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/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
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool_worker.beam
 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