- Upgrade to version 3.2.2

- Take over maintainership
- Add staging support

PR:		ports/184036
Submitted by:	olgeni
Approved by:	maintainer timeout

3 files changed, 35 insertions, 37 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index a0c5b4b21988..76009b2f1f6a 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	rabbitmq
-PORTVERSION=	3.1.5
-PORTREVISION=	1
+PORTVERSION=	3.2.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
 
-MAINTAINER=	pneumann@gmail.com
+MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	RabbitMQ is an implementation of AMQP
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
@@ -25,21 +24,18 @@ SHEBANG_FILES=	calculate-relative plugins-src/rabbitmq-amqp1.0/codegen.py
 python_OLD_CMD=	.*python
 python_CMD=	${PYTHON_CMD}
 
-USERS=	rabbitmq
-GROUPS=	rabbitmq
+USERS=		rabbitmq
+GROUPS=		rabbitmq
 
-PLIST_SUB=	"VERSION=${PORTVERSION}"
-
-MAN1=		rabbitmq-server.1 rabbitmqctl.1 rabbitmq-plugins.1
-MAN5=		rabbitmq-env.conf.5
-MANCOMPRESSED=	yes
+PLIST_SUB=	VERSION=${PORTVERSION}
 
 SCRIPTS_DIR=	${WRKSRC}/scripts/
 MAKE_ARGS+=	PYTHON=${PYTHON_CMD}
-MAKE_ENV+=	TARGET_DIR="${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" SBIN_DIR="${PREFIX}/sbin/" \
-		MAN_DIR="${PREFIX}/man"
+MAKE_ENV+=	TARGET_DIR="${STAGEDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" \
+		SBIN_DIR="${STAGEDIR}${PREFIX}/sbin/" \
+		MAN_DIR="${STAGEDIR}${PREFIX}/man" \
+		DOC_INSTALL_DIR="${STAGEDIR}${EXAMPLESDIR}"
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|erl|${LOCALBASE}/bin/erl|g' \
 		${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl \
@@ -54,17 +50,9 @@ post-patch:
 		${WRKSRC}/Makefile
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 
-pre-install:
-	@${FIND} ${WRKSRC}/ebin ${WRKSRC}/include -type d | \
-		${XARGS} ${CHMOD} 0755
-	@${FIND} ${WRKSRC}/ebin ${WRKSRC}/include -type f | \
-		${XARGS} ${CHMOD} 0644
-	@${MKDIR} ${PREFIX}/etc/rabbitmq
-
 post-install:
-	@${MKDIR} /var/db/rabbitmq/mnesia
-	@${MKDIR} /var/log/rabbitmq
-	@${CHOWN} -R rabbitmq:rabbitmq /var/db/rabbitmq
-	@${CHOWN} -R rabbitmq:rabbitmq /var/log/rabbitmq
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/rabbitmq
+	@${MKDIR} ${STAGEDIR}/var/db/rabbitmq/mnesia
+	@${MKDIR} ${STAGEDIR}/var/log/rabbitmq
 
 .include <bsd.port.mk>
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index b575cc3ef562..6a43db0145e9 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rabbitmq-server-3.1.5.tar.gz) = c6952bdd0f0d9551fa4a068e65ad6506583a3e81babbb4e4747e0073366a6c35
-SIZE (rabbitmq-server-3.1.5.tar.gz) = 3562221
+SHA256 (rabbitmq-server-3.2.2.tar.gz) = c6f985d2bf69de60fa543ebfff190f233d2ab8faee78a10cfb065b4e4d1406ba
+SIZE (rabbitmq-server-3.2.2.tar.gz) = 3583974
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index 39644dcd541c..d8a6373be9ef 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -66,6 +66,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel_sup_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_client_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_command_assembler.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_helper_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_control_main.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ctl_usage.beam
@@ -88,7 +89,6 @@ 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_guid.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_heartbeat.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_intermediate_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_limiter.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_log.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memory_monitor.beam
@@ -117,10 +117,12 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_parameter_validation.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins_main.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins_usage.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_policies.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_policy.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_policy_validator.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_prelaunch.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_collector.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_decorator.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_registry.beam
@@ -162,9 +164,9 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_framing.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_msg_store.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/README
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/amqp_client-%%VERSION%%.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-0.5.0-rmq3.1.5-git4b93c2d.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/eldap-3.1.5-gite309de4.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/mochiweb-2.7.0-rmq3.1.5-git680dba8.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-0.5.0-rmq%%VERSION%%-git4b93c2d.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/eldap-%%VERSION%%-gite309de4.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/mochiweb-2.7.0-rmq%%VERSION%%-git680dba8.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_amqp1_0-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_ldap-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_mechanism_ssl-%%VERSION%%.ez
@@ -185,25 +187,33 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_tracing-%%VERSION%%.
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_dispatch-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rfc4627_jsonrpc-3.1.5-git5e67120.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/sockjs-0.3.4-rmq3.1.5-git3132eb9.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/webmachine-1.10.3-rmq3.1.5-gite9359c7.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rfc4627_jsonrpc-%%VERSION%%-git5e67120.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/sockjs-0.3.4-rmq%%VERSION%%-git3132eb9.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/webmachine-1.10.3-rmq%%VERSION%%-gite9359c7.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-defaults
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-env
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-plugins
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-server
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmqctl
+man/man1/rabbitmq-plugins.1.gz
+man/man1/rabbitmq-server.1.gz
+man/man1/rabbitmqctl.1.gz
+man/man5/rabbitmq-env.conf.5.gz
 @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
 @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%
+@dirrmtry lib/erlang/lib
+@dirrmtry lib/erlang
+@exec mkdir -p %D/etc/rabbitmq
 @dirrmtry etc/rabbitmq
-@unexec rmdir /var/log/rabbitmq 2>/dev/null || true
-@unexec rmdir /var/db/rabbitmq/mnesia 2>/dev/null || true
-@unexec rmdir /var/db/rabbitmq 2>/dev/null || true
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rabbitmq.config.example
+@dirrmtry %%PORTEXAMPLES%%%%EXAMPLESDIR%%
 @exec mkdir -p /var/log/rabbitmq
 @exec chown -R rabbitmq:rabbitmq /var/log/rabbitmq
 @exec mkdir -p /var/db/rabbitmq/mnesia
 @exec chown -R rabbitmq:rabbitmq /var/db/rabbitmq
-@exec mkdir -p %D/etc/rabbitmq
+@dirrmtry /var/log/rabbitmq
+@dirrmtry /var/db/rabbitmq/mnesia
+@dirrmtry /var/db/rabbitmq