From owner-svn-ports-all@freebsd.org Sat Jun 24 18:16:33 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92736DA3661; Sat, 24 Jun 2017 18:16:33 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 627AC74E6A; Sat, 24 Jun 2017 18:16:33 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5OIGWBv046733; Sat, 24 Jun 2017 18:16:32 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5OIGWPG046732; Sat, 24 Jun 2017 18:16:32 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201706241816.v5OIGWPG046732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Sat, 24 Jun 2017 18:16:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r444234 - head/net/rabbitmq X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Jun 2017 18:16:33 -0000 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 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 \