From nobody Mon Jul 31 09:29:11 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RDtH35KMjz4pyTM; Mon, 31 Jul 2023 09:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RDtGw0Bjrz3l3f; Mon, 31 Jul 2023 09:29:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690795752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nta8/7aZXzh4y9orntMLBQIZJrIiCumk5zODZcX6Iq0=; b=wWLiOJTKIaTXMnZY1Xi5nbGt/44Cs8k4LKPgI3Q0KDDzpCuRdZjuzwhj8212cO2YaW3QH7 jmbqQm/V4PdUS7fSMsep7odsNCJpShC/9NsBZT5h6A9ZcS9yxA8nSxkwCf7Zx1T3VaSalv fis16v1adgj1p6E9+olNHKiInczLeks3uFjOYCZkCD1VzUnj0Gkv9hxFq6ps2Abk22SMOp MWGc3jlTC/upRi24HPv3GOQ/qMLVUy4mb6BATIeE+HXLY6Uvn7ZsVZ93mPqfYetRgwvtqz seY6WJseXbvRe4i1+erjNnh95KMnffd2HhnRvarFp15AeahAdHbmzzIatTll7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690795752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nta8/7aZXzh4y9orntMLBQIZJrIiCumk5zODZcX6Iq0=; b=kzL/C64CX/MAMzpkajSPUypta+W0d/fMYIpeFbdWRP3Wl0xnjrAEWVz70vO3YvWIh/2PN6 hhoYEQhfykXRyTSIcqulrQnBrym21lgeDPZmXNVNPp8IaS4+WhwLH0CDmHAWbEdaScpHFK 2qMgt/JOl9+z7WvEbcKyr60Wix2/+ndYT8Wni6BQJ4vNuG/gaYoHLKe061ykLUZhRBHRN2 tXvpeSAX88cWombMwYNt3kfLt2y3Mq716JoT9I49gnrFVicTUUUNM/lAWKI9s9Ptky6ro6 kjm76uE9IB6OMynT4Q4ixQ5y6yOnG9ZQ4VWs/JoD/lTjEQITD4ZtiBf+1k4HIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690795752; a=rsa-sha256; cv=none; b=tbfQcXoNaf2aCVW6+hcUmCmt0IsMxeRTYvhDlPyGWf/3LYVXAvpciIQ0CYXeW8mi7HCcvh njMvfx9hDEeVgbl9FN5wAxWeipHwQPuQUWidXSMAJhykOlFrw0l0YYpZhUvnUGjCLKN8kD WqEyaBIjT/uiGrw53tTMWESk15po949tQNfhGdPuOf4zMbYeuvaGUi60fnel4LdqXsOkfP KjKGIg9BKM3M49+1mfYmHcX4AjS7aJmEme/IPuGcFbCW6prBjcgxcLyv/8cslRR/MSPCzs +DelvupuQCX+sdsu2Vj4DmFtxZJbAllceCF+d4S+QURev/83N5Ta2K7wk/RF4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDtGv4pSzzqyQ; Mon, 31 Jul 2023 09:29:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36V9TB63045940; Mon, 31 Jul 2023 09:29:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36V9TB4g045939; Mon, 31 Jul 2023 09:29:11 GMT (envelope-from git) Date: Mon, 31 Jul 2023 09:29:11 GMT Message-Id: <202307310929.36V9TB4g045939@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: eaf122aac006 - main - net/rabbitmq: Fix `rabbitmq` rc.d script to use `%%_ERLANG_LIB%%` List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eaf122aac00621177a187c6cc77629bcc2e11318 Auto-Submitted: auto-generated 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 AuthorDate: 2023-07-31 09:22:33 +0000 Commit: Jean-Sébastien Pédron 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}