Update net/rabbitmq to version 3.6.6.

8 files changed, 38 insertions, 37 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index c4828af17cf4..101a141b3a2b 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rabbitmq
-PORTVERSION=	3.6.5
-PORTREVISION=	1
+PORTVERSION=	3.6.6
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
@@ -39,12 +38,13 @@ PLIST_SUB=	VERSION=${PORTVERSION}
 CPE_VENDOR=	pivotal_software
 
 REINPLACE_ARGS=	-i ""
-SCRIPTS_DIR=	${WRKSRC}/scripts/
+SCRIPTS_DIR=	${WRKSRC}/deps/rabbit/scripts
 MAKE_ARGS+=	PYTHON=${PYTHON_CMD}
 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}"
+		DOC_INSTALL_DIR="${STAGEDIR}${EXAMPLESDIR}" \
+		VERSION="${PORTVERSION}"
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -57,21 +57,21 @@ post-patch:
 		${SCRIPTS_DIR}/rabbitmq-env \
 		${SCRIPTS_DIR}/rabbitmq-plugins \
 		${SCRIPTS_DIR}/rabbitmq-defaults \
-		${WRKSRC}/docs/rabbitmq-env.conf.5.xml
+		${WRKSRC}/deps/rabbit/docs/rabbitmq-env.conf.5.xml
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/rabbitmq
 	@${MKDIR} ${STAGEDIR}/var/db/rabbitmq/mnesia
 	@${MKDIR} ${STAGEDIR}/var/log/rabbitmq
-	${INSTALL_DATA} ${WRKSRC}/docs/rabbitmq.config.example \
+	${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/rabbitmq.config.example \
 		${STAGEDIR}${PREFIX}/etc/rabbitmq/rabbitmq.config.sample
 .for _file in rabbitmq-defaults rabbitmq-env rabbitmq-plugins rabbitmq-server rabbitmqctl
 	${LN} -s ../lib/erlang/lib/rabbitmq_server-${PORTVERSION}/sbin/${_file} ${STAGEDIR}${PREFIX}/sbin
 .endfor
 .for _file in rabbitmq-plugins.1 rabbitmq-server.1 rabbitmqctl.1
-	${INSTALL_MAN} ${WRKSRC}/docs/${_file} ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/deps/rabbit/docs/${_file} ${STAGEDIR}${MAN1PREFIX}/man/man1
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/docs/rabbitmq-env.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/deps/rabbit/docs/rabbitmq-env.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 
 post-install-ADMIN-on:
 	${INSTALL} ${WRKSRC}/deps/rabbitmq_management/bin/rabbitmqadmin ${STAGEDIR}${PREFIX}/bin
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 2f2542a63bae..625df9c6dfda 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470418703
-SHA256 (rabbitmq-server-3.6.5.tar.xz) = 9550433ca8aaf5130bf5235bb978c44d3c4694cbd09d97114b3859f4895788ec
-SIZE (rabbitmq-server-3.6.5.tar.xz) = 2923164
+TIMESTAMP = 1479770211
+SHA256 (rabbitmq-server-3.6.6.tar.xz) = 395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e
+SIZE (rabbitmq-server-3.6.6.tar.xz) = 2471724
diff --git a/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins
new file mode 100644
index 000000000000..6edde583d11d
--- /dev/null
+++ b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins
@@ -0,0 +1,10 @@
+--- deps/rabbit/scripts/rabbitmq-plugins.orig	2016-11-22 00:22:17 UTC
++++ deps/rabbit/scripts/rabbitmq-plugins
+@@ -25,6 +25,7 @@ if [ -z "$ERL_CRASH_DUMP_SECONDS" ]; the
+ fi
+ 
+ RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \
++HOME=/var/db/rabbitmq \
+ exec ${ERL_DIR}erl \
+     -pa "${RABBITMQ_HOME}/ebin" \
+     -noinput \
diff --git a/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server
new file mode 100644
index 000000000000..be4595d83953
--- /dev/null
+++ b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server
@@ -0,0 +1,10 @@
+--- deps/rabbit/scripts/rabbitmq-server.orig	2016-11-22 00:22:59 UTC
++++ deps/rabbit/scripts/rabbitmq-server
+@@ -151,6 +151,7 @@ start_rabbitmq_server() {
+     ensure_thread_pool_size
+     check_start_params &&
+     RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
++    HOME=/var/db/rabbitmq \
+     exec ${ERL_DIR}erl \
+         -pa ${RABBITMQ_SERVER_CODE_PATH} ${RABBITMQ_EBIN_ROOT} \
+         ${RABBITMQ_START_RABBIT} \
diff --git a/net/rabbitmq/files/patch-scripts_rabbitmqctl b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl
index edb768cdbffb..24ad0933ae9f 100644
--- a/net/rabbitmq/files/patch-scripts_rabbitmqctl
+++ b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl
@@ -1,10 +1,10 @@
---- scripts/rabbitmqctl.orig	2015-09-24 20:00:50 UTC
-+++ scripts/rabbitmqctl
-@@ -23,6 +23,7 @@
+--- deps/rabbit/scripts/rabbitmqctl.orig	2016-11-22 00:23:32 UTC
++++ deps/rabbit/scripts/rabbitmqctl
+@@ -28,6 +28,7 @@ fi
  # (e.g. forget_cluster_node --offline) require us to impersonate the
  # real node.
  RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \
 +HOME=/var/db/rabbitmq \
  exec ${ERL_DIR}erl \
      -pa "${RABBITMQ_HOME}/ebin" \
-     -noinput \
+     -noinput +B \
diff --git a/net/rabbitmq/files/patch-scripts_rabbitmq-plugins b/net/rabbitmq/files/patch-scripts_rabbitmq-plugins
deleted file mode 100644
index f747941a51d7..000000000000
--- a/net/rabbitmq/files/patch-scripts_rabbitmq-plugins
+++ /dev/null
@@ -1,10 +0,0 @@
---- scripts/rabbitmq-plugins.orig	2015-09-24 20:00:50 UTC
-+++ scripts/rabbitmq-plugins
-@@ -20,6 +20,7 @@
- . `dirname $0`/rabbitmq-env
- 
- RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \
-+HOME=/var/db/rabbitmq \
- exec ${ERL_DIR}erl \
-     -pa "${RABBITMQ_HOME}/ebin" \
-     -noinput \
diff --git a/net/rabbitmq/files/patch-scripts_rabbitmq-server b/net/rabbitmq/files/patch-scripts_rabbitmq-server
deleted file mode 100644
index ee8597ee61e9..000000000000
--- a/net/rabbitmq/files/patch-scripts_rabbitmq-server
+++ /dev/null
@@ -1,10 +0,0 @@
---- scripts/rabbitmq-server.orig	2015-09-24 20:00:50 UTC
-+++ scripts/rabbitmq-server
-@@ -101,6 +101,7 @@ set -f
- 
- start_rabbitmq_server() {
-     RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
-+    HOME=/var/db/rabbitmq \
-     exec ${ERL_DIR}erl \
-         -pa ${RABBITMQ_EBIN_ROOT} \
-         ${RABBITMQ_START_RABBIT} \
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index db80d45865ff..8117304d64c4 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -9,6 +9,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-BSD-base64js
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-BSD-glMatrix
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-EPL-OTP
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-EJS10
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Erlware-Commons
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Flot
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Mochi
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Mochiweb
@@ -28,8 +29,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/lqueue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mirrored_supervisor_sups.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mnesia_sync.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mochinum.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg2_fixed.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg_local.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.app
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.beam
@@ -51,6 +50,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_client_sup.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_control_pbe.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ctl_usage.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_dead_letter.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_diagnostics.beam
@@ -94,6 +94,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_md5.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_sha256.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_sha512.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_pbe.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