Received: by mail.netbsd.org (Postfix, from userid 605) id A8D2684F53; Tue, 15 Nov 2022 15:58:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D86AA84D6F for ; Tue, 15 Nov 2022 15:58:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 0pnHS3JIQPVX for ; Tue, 15 Nov 2022 15:58:02 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3371284CEF for ; Tue, 15 Nov 2022 15:58:02 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2C9EEFA90; Tue, 15 Nov 2022 15:58:02 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1668527882213780" MIME-Version: 1.0 Date: Tue, 15 Nov 2022 15:58:02 +0000 From: "Brad Spencer" Subject: CVS commit: pkgsrc/net/rabbitmq To: pkgsrc-changes@NetBSD.org Reply-To: brad@netbsd.org X-Mailer: log_accum Message-Id: <20221115155802.2C9EEFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1668527882213780 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: brad Date: Tue Nov 15 15:58:02 UTC 2022 Modified Files: pkgsrc/net/rabbitmq: Makefile Log Message: A SUBST_SED was catching too much and breaking rabbitmq-server. Change the SUBST_SED to be more restrictive. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 pkgsrc/net/rabbitmq/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1668527882213780 Content-Disposition: inline Content-Length: 1023 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/rabbitmq/Makefile diff -u pkgsrc/net/rabbitmq/Makefile:1.69 pkgsrc/net/rabbitmq/Makefile:1.70 --- pkgsrc/net/rabbitmq/Makefile:1.69 Sat Oct 15 18:26:27 2022 +++ pkgsrc/net/rabbitmq/Makefile Tue Nov 15 15:58:02 2022 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.69 2022/10/15 18:26:27 triaxx Exp $ +# $NetBSD: Makefile,v 1.70 2022/11/15 15:58:02 brad Exp $ DISTNAME= rabbitmq-server-3.11.1 PKGNAME= ${DISTNAME:S/-server//} CATEGORIES= net +PKGREVISION= 2 MASTER_SITES= ${MASTER_SITE_GITHUB:=rabbitmq/} EXTRACT_SUFX= .tar.xz GITHUB_PROJECT= rabbitmq-server @@ -70,7 +71,7 @@ SUBST_FILES.paths+= ${SCRIPTS_DIR}/rabbi SUBST_SED.paths= -e 's|/etc/rabbitmq|${PKG_SYSCONFDIR}|g' SUBST_SED.paths+= -e 's|/var/lib|${VARBASE}/db|g' SUBST_SED.paths+= -e 's|/var/log|${VARBASE}/log|g' -SUBST_SED.paths+= -e 's|erl|${PREFIX}/bin/erl|g' +SUBST_SED.paths+= -e 's|exec erl|exec ${PREFIX}/bin/erl|g' SUBST_SED.paths+= -e 's|@RABBITMQ_HOME@|${PREFIX}/${RABBITMQ_HOME}|g' SUBST_CLASSES+= prefix --_----------=_1668527882213780--