[Midnightbsd-cvs] mports [22444] trunk/net/rabbitmq: rabbitmq 3.6.6
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat May 13 11:56:02 EDT 2017
Revision: 22444
http://svnweb.midnightbsd.org/mports/?rev=22444
Author: laffer1
Date: 2017-05-13 11:56:02 -0400 (Sat, 13 May 2017)
Log Message:
-----------
rabbitmq 3.6.6
Modified Paths:
--------------
trunk/net/rabbitmq/Makefile
trunk/net/rabbitmq/distinfo
trunk/net/rabbitmq/files/rabbitmq.in
trunk/net/rabbitmq/pkg-plist
Removed Paths:
-------------
trunk/net/rabbitmq/files/patch-scripts_rabbitmq-plugins
trunk/net/rabbitmq/files/patch-scripts_rabbitmq-server
trunk/net/rabbitmq/files/patch-scripts_rabbitmqctl
Modified: trunk/net/rabbitmq/Makefile
===================================================================
--- trunk/net/rabbitmq/Makefile 2017-05-12 23:46:40 UTC (rev 22443)
+++ trunk/net/rabbitmq/Makefile 2017-05-13 15:56:02 UTC (rev 22444)
@@ -2,7 +2,7 @@
# $MidnightBSD$
PORTNAME= rabbitmq
-PORTVERSION= 3.6.5
+PORTVERSION= 3.6.6
CATEGORIES= net
MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
DISTNAME= ${PORTNAME}-server-${PORTVERSION}
@@ -12,13 +12,12 @@
LICENSE= mpl
-BUILD_DEPENDS= erl:${PORTSDIR}/lang/erlang \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson \
- xmlto:${PORTSDIR}/textproc/xmlto \
- unzip:${PORTSDIR}/archivers/unzip \
- zip:${PORTSDIR}/archivers/zip \
- rsync:${PORTSDIR}/net/rsync
-RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS= erl:lang/erlang \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson \
+ xmlto:textproc/xmlto \
+ zip:archivers/zip \
+ rsync:net/rsync
+RUN_DEPENDS= erl:lang/erlang
OPTIONS_DEFINE= ADMIN
OPTIONS_SUB= yes
@@ -26,25 +25,26 @@
ADMIN_DESC= Install rabbitmqadmin script
ALL_TARGET= all manpages
-USES= cpe gmake python:build shebangfix tar:xz
+USES= cpe gmake python:build tar:xz
USE_RC_SUBR= rabbitmq
-python_OLD_CMD= .*python
+NO_ARCH= yes
USERS= rabbitmq
GROUPS= rabbitmq
-PLIST_SUB= VERSION=${PORTVERSION}
+PLIST_SUB+= VERSION=${PORTVERSION}
CPE_VENDOR= pivotal_software
FAKE_OPTS= trueprefix
REINPLACE_ARGS= -i ""
-SCRIPTS_DIR= ${WRKSRC}/scripts/
+SCRIPTS_DIR= ${WRKSRC}/deps/rabbit/scripts
MAKE_ARGS+= PYTHON=${PYTHON_CMD}
MAKE_ENV+= TARGET_DIR="${FAKE_DESTDIR}${TRUE_PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" \
SBIN_DIR="${FAKE_DESTDIR}${TRUE_PREFIX}/sbin/" \
MAN_DIR="${FAKE_DESTDIR}${TRUE_PREFIX}/man" \
- DOC_INSTALL_DIR="${FAKE_DESTDIR}${EXAMPLESDIR}"
+ DOC_INSTALL_DIR="${FAKE_DESTDIR}${EXAMPLESDIR}" \
+ VERSION="${PORTVERSION}"
MAKE_JOBS_UNSAFE= yes
@@ -61,21 +61,21 @@
${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} ${PREFIX}/etc/rabbitmq
@${MKDIR} ${FAKE_DESTDIR}/var/db/rabbitmq/mnesia
@${MKDIR} ${FAKE_DESTDIR}/var/log/rabbitmq
- ${INSTALL_DATA} ${WRKSRC}/docs/rabbitmq.config.example \
+ ${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/rabbitmq.config.example \
${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} ${PREFIX}/sbin
.endfor
.for _file in rabbitmq-plugins.1 rabbitmq-server.1 rabbitmqctl.1
- ${INSTALL_MAN} ${WRKSRC}/docs/${_file} ${MAN1PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/deps/rabbit/docs/${_file} ${STAGEDIR}${MAN1PREFIX}/man/man1
.endfor
- ${INSTALL_MAN} ${WRKSRC}/docs/rabbitmq-env.conf.5 ${MAN5PREFIX}/man/man5
+ ${INSTALL_MAN} ${WRKSRC}/deps/rabbit/docs/rabbitmq-env.conf.5 ${MAN5PREFIX}/man/man5
${INSTALL} ${WRKSRC}/deps/rabbitmq_management/bin/rabbitmqadmin ${PREFIX}/bin
.include <bsd.port.mk>
Modified: trunk/net/rabbitmq/distinfo
===================================================================
--- trunk/net/rabbitmq/distinfo 2017-05-12 23:46:40 UTC (rev 22443)
+++ trunk/net/rabbitmq/distinfo 2017-05-13 15:56:02 UTC (rev 22444)
@@ -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
Deleted: trunk/net/rabbitmq/files/patch-scripts_rabbitmq-plugins
===================================================================
--- trunk/net/rabbitmq/files/patch-scripts_rabbitmq-plugins 2017-05-12 23:46:40 UTC (rev 22443)
+++ trunk/net/rabbitmq/files/patch-scripts_rabbitmq-plugins 2017-05-13 15:56:02 UTC (rev 22444)
@@ -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 \
Deleted: trunk/net/rabbitmq/files/patch-scripts_rabbitmq-server
===================================================================
--- trunk/net/rabbitmq/files/patch-scripts_rabbitmq-server 2017-05-12 23:46:40 UTC (rev 22443)
+++ trunk/net/rabbitmq/files/patch-scripts_rabbitmq-server 2017-05-13 15:56:02 UTC (rev 22444)
@@ -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} \
Deleted: trunk/net/rabbitmq/files/patch-scripts_rabbitmqctl
===================================================================
--- trunk/net/rabbitmq/files/patch-scripts_rabbitmqctl 2017-05-12 23:46:40 UTC (rev 22443)
+++ trunk/net/rabbitmq/files/patch-scripts_rabbitmqctl 2017-05-13 15:56:02 UTC (rev 22444)
@@ -1,10 +0,0 @@
---- scripts/rabbitmqctl.orig 2015-09-24 20:00:50 UTC
-+++ scripts/rabbitmqctl
-@@ -23,6 +23,7 @@
- # (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 \
Modified: trunk/net/rabbitmq/files/rabbitmq.in
===================================================================
--- trunk/net/rabbitmq/files/rabbitmq.in 2017-05-12 23:46:40 UTC (rev 22443)
+++ trunk/net/rabbitmq/files/rabbitmq.in 2017-05-13 15:56:02 UTC (rev 22444)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: head/net/rabbitmq/files/rabbitmq.in 413880 2016-04-23 15:12:32Z olgeni $
+# $FreeBSD: head/net/rabbitmq/files/rabbitmq.in 432478 2017-01-26 09:41:06Z olgeni $
#
# PROVIDE: rabbitmq
# REQUIRE: DAEMON
@@ -24,6 +24,7 @@
rabbitmq_server="%%PREFIX%%/sbin/rabbitmq-server"
rabbitmq_ctl="%%PREFIX%%/sbin/rabbitmqctl"
+rabbitmq_env_conf="%%PREFIX%%/etc/rabbitmq/rabbitmq-env.conf"
pidfile="/var/run/${name}.pid"
daemon_pidfile="/var/run/${name}-daemon.pid"
@@ -33,8 +34,13 @@
status_cmd="su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} status\"'"
extra_commands="rotate_logs status"
+: ${RABBITMQ_LOG_BASE:=/var/log/${name}}
+
+if [ -f ${rabbitmq_env_conf} ]; then
+ . ${rabbitmq_env_conf}
+fi
+
export RABBITMQ_HOME=/var/db/${name}
-export RABBITMQ_LOGDIR=/var/log/${name}
# Prevent conflicts with amqp_client and rabbit_common applications that
# may be installed in ERL_LIBS.
@@ -48,8 +54,8 @@
chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_HOME}
fi
- if [ -d ${RABBITMQ_LOGDIR} ]; then
- chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOGDIR}
+ if [ -d ${RABBITMQ_LOG_BASE} ]; then
+ chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOG_BASE}
fi
if [ -f ${RABBITMQ_HOME}/.erlang.cookie ]; then
@@ -56,7 +62,7 @@
chmod 600 ${RABBITMQ_HOME}/.erlang.cookie
fi
- env HOME=${RABBITMQ_HOME} daemon -c -f -u ${rabbitmq_user} -p ${pidfile} -P ${daemon_pidfile} ${rabbitmq_server}
+ env HOME=${RABBITMQ_HOME} /usr/sbin/daemon -c -f -u ${rabbitmq_user} -p ${pidfile} -P ${daemon_pidfile} ${rabbitmq_server}
debug "Running: rabbitmqctl wait ${pidfile}"
${rabbitmq_ctl} wait ${pidfile} >/dev/null 2>&1
}
Modified: trunk/net/rabbitmq/pkg-plist
===================================================================
--- trunk/net/rabbitmq/pkg-plist 2017-05-12 23:46:40 UTC (rev 22443)
+++ trunk/net/rabbitmq/pkg-plist 2017-05-13 15:56:02 UTC (rev 22444)
@@ -9,6 +9,7 @@
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/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_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_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
More information about the Midnightbsd-cvs
mailing list