- Update to 1.5.0

PR:		129751
Submitted by:	"Phillip N." <pneumann@gmail.com> (maintainer)

5 files changed, 34 insertions, 61 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 7546745df12c..812bd39256e6 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rabbitmq
-PORTVERSION=	1.4.0
-PORTREVISION=	2
+PORTVERSION=	1.5.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
@@ -15,12 +14,14 @@ DISTNAME=	${PORTNAME}-server-${PORTVERSION}
 MAINTAINER=	pneumann@gmail.com
 COMMENT=	RabbitMQ is an implementation of AMQP
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang-lite
+BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang-lite \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson
 RUN_DEPENDS=	erlc:${PORTSDIR}/lang/erlang-lite
 
 USE_GMAKE=	yes
 USE_PYTHON=	yes
-MAKE_ENV+=	TARGET_DIR="${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" SBIN_DIR="${PREFIX}/sbin/"
+MAKE_ENV+=	TARGET_DIR="${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" SBIN_DIR="${PREFIX}/sbin/" \
+		MAN_DIR="${PREFIX}/man"
 SCRIPTS_DIR=	${WRKSRC}/scripts/
 USE_RC_SUBR=	rabbitmq
 PLIST_SUB=	"VERSION=${PORTVERSION}"
@@ -28,6 +29,9 @@ SUB_FILES=	pkg-install
 RABBITMQ_USER=	rabbitmq
 RABBITMQ_GROUP=	${RABBITMQ_USER}
 
+MAN1=	rabbitmq-multi.1 rabbitmq-server.1 rabbitmqctl.1
+MAN5=	rabbitmq.5
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/default|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|erl|${PREFIX}/bin/erl|g' \
 		${SCRIPTS_DIR}/rabbitmq-multi ${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 2b46e0b15cea..67c6fe8e0ccf 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,3 +1,3 @@
-MD5 (rabbitmq-server-1.4.0.tar.gz) = ac43cb6178d992eae192ebe19557ccd5
-SHA256 (rabbitmq-server-1.4.0.tar.gz) = d00b3022a71a4eb3b028e1eb3c1a0881c2a93bf6d705a9351fc42c87c55aeca1
-SIZE (rabbitmq-server-1.4.0.tar.gz) = 108625
+MD5 (rabbitmq-server-1.5.0.tar.gz) = f5f7d02bae83fcf028cdbcb737028932
+SHA256 (rabbitmq-server-1.5.0.tar.gz) = 0531d8a62dbeb018a69672fc638ff324b8a92e4c9674520c046b4dae117fa72a
+SIZE (rabbitmq-server-1.5.0.tar.gz) = 111389
diff --git a/net/rabbitmq/files/patch-Makefile b/net/rabbitmq/files/patch-Makefile
deleted file mode 100644
index 337609893f48..000000000000
--- a/net/rabbitmq/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2008-08-15 20:56:25.000000000 -0400
-+++ Makefile	2008-08-15 20:57:14.000000000 -0400
-@@ -113,7 +113,7 @@
- 		cp BUILD $(GENERIC_STAGE_DIR); \
- 	fi
- 
--	sed -i 's/%%VERSION%%/$(VERSION)/' $(GENERIC_STAGE_DIR)/ebin/rabbit.app
-+	#sed -i 's/%%VERSION%%/$(VERSION)/' $(GENERIC_STAGE_DIR)/ebin/rabbit.app
- 
- srcdist: distclean
- 	$(MAKE) VERSION=$(VERSION) GENERIC_STAGE_DIR=dist/$(TARBALL_NAME) generic_stage
diff --git a/net/rabbitmq/files/rabbitmq.in b/net/rabbitmq/files/rabbitmq.in
index 1b8feab393e4..37096b8a5d5c 100644
--- a/net/rabbitmq/files/rabbitmq.in
+++ b/net/rabbitmq/files/rabbitmq.in
@@ -20,11 +20,26 @@ rcvar=`set_rcvar`
 # Set some defaults
 rabbitmq_enable=${rabbitmq_enable:-"NO"}
 rabbitmq_user=${rabbitmq_user:-"rabbitmq"}
+rabbitmq_nodes=${rabbitmq_nodes:-"1"}
 
-prefix=%%PREFIX%%
-start_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${prefix}/sbin/rabbitmq-server -detached\"'"
-stop_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${prefix}/sbin/rabbitmqctl stop\"'"
+rabbitmq_multi="%%PREFIX%%/sbin/rabbitmq-multi"
+start_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} start_all ${rabbitmq_nodes}\"'"
+stop_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} stop_all\"'"
 
-load_rc_config $name
+extra_commands="rotate_logs status"
+
+rotate_logs_cmd="${name}_rotate_logs"
+status_cmd="${name}_status"
+
+rabbitmq_rotate_logs()
+{
+	env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} rotate_logs\"'"
+}
 
+rabbitmq_status()
+{
+	env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} status\"'"
+}
+
+load_rc_config $name
 run_rc_command "$1"
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index ae6bb397562d..eea5bfbf2ffd 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -9,6 +9,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.app
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.rel
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_access_control.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_alarm.beam
 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
@@ -17,12 +18,14 @@ 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_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_framing.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_channel.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_heartbeat.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_linux.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
@@ -30,11 +33,10 @@ 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_reader.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_realm.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_ticket.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/tcp_acceptor.beam
@@ -45,43 +47,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit.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%%/src/buffering_proxy.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_access_control.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_amqqueue.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_amqqueue_process.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_amqqueue_sup.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_binary_generator.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_binary_parser.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_channel.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_control.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_error_logger.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_exchange.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_framing.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_framing_channel.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_heartbeat.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_load.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_log.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_misc.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_mnesia.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_multi.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_networking.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_node_monitor.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_persister.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_reader.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_realm.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_router.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_sup.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_tests.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_ticket.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_tracer.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_writer.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/tcp_acceptor.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/tcp_acceptor_sup.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/tcp_client_sup.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/tcp_listener.erl
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/tcp_listener_sup.erl
-@dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/src
 @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/include
 @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin
 @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%