Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Jun 2017 18:16:32 +0000 (UTC)
From:      Jimmy Olgeni <olgeni@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r444234 - head/net/rabbitmq
Message-ID:  <201706241816.v5OIGWPG046732@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olgeni
Date: Sat Jun 24 18:16:32 2017
New Revision: 444234
URL: https://svnweb.freebsd.org/changeset/ports/444234

Log:
  Force using erlang-runtime19 for net/rabbitmq: the current version is NOT
  COMPATIBLE with Erlang 20 and can lead to data corruption during upgrades.
  
  The proper solution would be to build a release with a bundled runtime, but
  this will have to do for now.

Modified:
  head/net/rabbitmq/Makefile

Modified: head/net/rabbitmq/Makefile
==============================================================================
--- head/net/rabbitmq/Makefile	Sat Jun 24 17:12:39 2017	(r444233)
+++ head/net/rabbitmq/Makefile	Sat Jun 24 18:16:32 2017	(r444234)
@@ -3,6 +3,7 @@
 
 PORTNAME=	rabbitmq
 PORTVERSION=	3.6.10
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
@@ -12,12 +13,12 @@ COMMENT=	RabbitMQ is an implementation of AMQP
 
 LICENSE=	MPL
 
-BUILD_DEPENDS=	erl:lang/erlang \
+BUILD_DEPENDS=	erlang-runtime19>=19.0:lang/erlang-runtime19 \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson \
 		xmlto:textproc/xmlto \
 		zip:archivers/zip \
 		rsync:net/rsync
-RUN_DEPENDS=	erl:lang/erlang
+RUN_DEPENDS=	erlang-runtime19>=19.0:lang/erlang-runtime19
 
 OPTIONS_DEFINE=	ADMIN
 OPTIONS_SUB=	yes
@@ -41,7 +42,8 @@ REINPLACE_ARGS=	-i ""
 SCRIPTS_DIR=	${WRKSRC}/deps/rabbit/scripts
 SHEBANG_FILES=	deps/rabbitmq_management/bin/rabbitmqadmin
 MAKE_ARGS+=	PYTHON=${PYTHON_CMD}
-MAKE_ENV+=	TARGET_DIR="${STAGEDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" \
+MAKE_ENV+=	PATH="${LOCALBASE}/lib/erlang19/bin:${PATH}" \
+		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}" \
@@ -52,7 +54,7 @@ MAKE_JOBS_UNSAFE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|$${ERL_DIR}erl|${PREFIX}/bin/erl|g' \
+	@${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|$${ERL_DIR}erl|${PREFIX}/lib/erlang19/bin/erl|g' \
 		${SCRIPTS_DIR}/rabbitmq-server \
 		${SCRIPTS_DIR}/rabbitmqctl \
 		${SCRIPTS_DIR}/rabbitmq-env \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706241816.v5OIGWPG046732>