Received: by mail.netbsd.org (Postfix, from userid 605)
	id 91E9084EDF; Thu,  7 Jul 2022 02:31:47 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id CBC5284EDA
	for <pkgsrc-changes@NetBSD.org>; Thu,  7 Jul 2022 02:31:46 +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 q0m2Jw8uNN-b for <pkgsrc-changes@netbsd.org>;
	Thu,  7 Jul 2022 02:31:46 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984])
	by mail.netbsd.org (Postfix) with ESMTP id 48B6D84D1D
	for <pkgsrc-changes@NetBSD.org>; Thu,  7 Jul 2022 02:31:46 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 4215AFB1A; Thu,  7 Jul 2022 02:31:46 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1657161106176430"
MIME-Version: 1.0
Date: Thu, 7 Jul 2022 02:31:46 +0000
From: "Pierre Pronchery" <khorben@netbsd.org>
Subject: CVS commit: pkgsrc/chat/prosody
To: pkgsrc-changes@NetBSD.org
Reply-To: khorben@netbsd.org
X-Mailer: log_accum
Message-Id: <20220707023146.4215AFB1A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: <pkgsrc-changes.NetBSD.org>
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_1657161106176430
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	khorben
Date:		Thu Jul  7 02:31:46 UTC 2022

Modified Files:
	pkgsrc/chat/prosody: Makefile
	pkgsrc/chat/prosody/files: prosody.sh

Log Message:
prosody: make sure pidfile always matches PROSODY_RUN in the RC script

This concludes my investigation on the correct path for the PID file.
No changes to the final binary if PROSODY_RUN is set to its default
value.

Tested on NetBSD/amd64.

XXX pull-up to pkgsrc-2022Q2


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/chat/prosody/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/prosody/files/prosody.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1657161106176430
Content-Disposition: inline
Content-Length: 1373
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/chat/prosody/Makefile
diff -u pkgsrc/chat/prosody/Makefile:1.38 pkgsrc/chat/prosody/Makefile:1.39
--- pkgsrc/chat/prosody/Makefile:1.38	Thu Jul  7 01:53:00 2022
+++ pkgsrc/chat/prosody/Makefile	Thu Jul  7 02:31:45 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2022/07/07 01:53:00 khorben Exp $
+# $NetBSD: Makefile,v 1.39 2022/07/07 02:31:45 khorben Exp $
 
 DISTNAME=		prosody-0.12.0
 PKGREVISION=		1
@@ -70,6 +70,7 @@ MAKE_ENV.SunOS+=	SOCKET_LIB=-lsocket
 MAKE_FILE=		makefile
 
 RCD_SCRIPTS=		prosody
+FILES_SUBST+=		PROSODY_RUN=${PROSODY_RUN}
 
 TEST_TARGET=		test
 

Index: pkgsrc/chat/prosody/files/prosody.sh
diff -u pkgsrc/chat/prosody/files/prosody.sh:1.3 pkgsrc/chat/prosody/files/prosody.sh:1.4
--- pkgsrc/chat/prosody/files/prosody.sh:1.3	Thu Jul  7 01:53:00 2022
+++ pkgsrc/chat/prosody/files/prosody.sh	Thu Jul  7 02:31:46 2022
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: prosody.sh,v 1.3 2022/07/07 01:53:00 khorben Exp $
+# $NetBSD: prosody.sh,v 1.4 2022/07/07 02:31:46 khorben Exp $
 #
 # PROVIDE: prosody
 # REQUIRE: DAEMON
@@ -13,7 +13,7 @@ name="prosody"
 rcvar=${name}
 ctl_command="@PREFIX@/bin/${name}ctl"
 required_files="@PKG_SYSCONFDIR@/${name}.cfg.lua"
-pidfile="@VARBASE@/run/prosody/${name}.pid"
+pidfile="@PROSODY_RUN@/${name}.pid"
 #start_precmd="ulimit -n 2048"
 extra_commands="reload status"
 


--_----------=_1657161106176430--