git: eaf122aac006 - main - net/rabbitmq: Fix `rabbitmq` rc.d script to use `%%_ERLANG_LIB%%`
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 31 Jul 2023 09:29:11 UTC
The branch main has been updated by dumbbell:
URL: https://cgit.FreeBSD.org/ports/commit/?id=eaf122aac00621177a187c6cc77629bcc2e11318
commit eaf122aac00621177a187c6cc77629bcc2e11318
Author: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
AuthorDate: 2023-07-31 09:22:33 +0000
Commit: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
CommitDate: 2023-07-31 09:27:57 +0000
net/rabbitmq: Fix `rabbitmq` rc.d script to use `%%_ERLANG_LIB%%`
[Why]
In commit c9033971719dc098b34276f11b8e5a5e22b966fd, the variable was
renamed from `ERLANG_LIB` to `_ERLANG_LIB`. However the rc.d script was
not updated to reflect that change.
Therefore the script didn't use the expected version of Erlang. This
meant that it could use `lang/erlang` if it was installed (which could
be incompatible) or not start at all.
[How]
The rc.d script is simply updated to use the new variable name. The port
revision is bumped to note the change.
PR: 271269
Reported by: Miroslav Lachman <000.fbsd@quip.cz>
---
net/rabbitmq/Makefile | 1 +
net/rabbitmq/files/rabbitmq.in | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index e8edc9a2df14..a888cc36c487 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,5 +1,6 @@
PORTNAME= rabbitmq
DISTVERSION= 3.11.19
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PORTVERSION}/
DISTNAME= ${PORTNAME}-server-${PORTVERSION}
diff --git a/net/rabbitmq/files/rabbitmq.in b/net/rabbitmq/files/rabbitmq.in
index b2581043633d..0d5699bbb58f 100644
--- a/net/rabbitmq/files/rabbitmq.in
+++ b/net/rabbitmq/files/rabbitmq.in
@@ -38,7 +38,7 @@ export HOME=/var/db/${name}
: ${RABBITMQ_LOG_BASE:=/var/log/${name}}
: ${RABBITMQ_PID_FILE:=${pidfile}}
# require precise OTP version in case multiple erlangs are installed
-export PATH=%%PREFIX%%/lib/%%ERLANG_LIB%%/bin:$PATH
+export PATH=%%PREFIX%%/lib/%%_ERLANG_LIB%%/bin:$PATH
if [ -f ${rabbitmq_env_conf} ]; then
. ${rabbitmq_env_conf}