Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1657158780171650"
MIME-Version: 1.0
Date: Thu, 7 Jul 2022 01:53:00 +0000
From: "Pierre Pronchery" <khorben@netbsd.org>
Subject: CVS commit: pkgsrc/chat/prosody
To: pkgsrc-changes@NetBSD.org
Reply-To: khorben@netbsd.org
Message-Id: <20220707015300.E5688FB1A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	khorben
Date:		Thu Jul  7 01:53:00 UTC 2022

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

Log Message:
prosody: fix the path to the PID file in the RC script

PROSODY_RUN is set to eg /var/run/prosody/prosody.pid instead of just
/var/run/prosody.pid, which is a good thing (tm) since prosody's user
needs the access rights to write to the corresponding directory.

Unfortunately, the directory is not automatically created nor the right
permissions set yet, but this is progress.

While there, appease pkglint(1).

Bumps PKGREVISION.

Tested on NetBSD/amd64.

XXX pull-up to pkgsrc-2022Q2 once the complete solution is in place


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/chat/prosody/Makefile
cvs rdiff -u -r1.2 -r1.3 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.


--_----------=_1657158780171650
Content-Disposition: inline
Content-Length: 1903
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.37 pkgsrc/chat/prosody/Makefile:1.38
--- pkgsrc/chat/prosody/Makefile:1.37	Sun May  8 21:24:12 2022
+++ pkgsrc/chat/prosody/Makefile	Thu Jul  7 01:53:00 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2022/05/08 21:24:12 khorben Exp $
+# $NetBSD: Makefile,v 1.38 2022/07/07 01:53:00 khorben Exp $
 
 DISTNAME=		prosody-0.12.0
+PKGREVISION=		1
 CATEGORIES=		chat
 MASTER_SITES=		https://prosody.im/downloads/source/
 
@@ -16,7 +17,7 @@ DEPENDS+=		${LUA_PKGPREFIX}-socket>=2.0:
 DEPENDS+=		${LUA_PKGPREFIX}-unbound-[0-9]*:../../net/lua-unbound
 
 HAS_CONFIGURE=		yes
-USE_LANGUAGES=		c99
+USE_LANGUAGES=		c
 BUILD_DEFS+=		VARBASE
 
 LUA_VERSIONS_ACCEPTED=	52 51
@@ -53,7 +54,7 @@ SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing default paths
 SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	makefile prosody.cfg.lua.dist
-SUBST_SED.path=		-e 's,$$(CONFIG),$$(DESTDIR)$(EGDIR),g'
+SUBST_SED.path=		-e 's,$$(CONFIG),$${DESTDIR}${EGDIR},g'
 SUBST_VARS.path=	EGDIR PROSODY_DATA PROSODY_LOG PROSODY_RUN
 
 CONFIGURE_ARGS+=	--cflags=${CFLAGS:Q}

Index: pkgsrc/chat/prosody/files/prosody.sh
diff -u pkgsrc/chat/prosody/files/prosody.sh:1.2 pkgsrc/chat/prosody/files/prosody.sh:1.3
--- pkgsrc/chat/prosody/files/prosody.sh:1.2	Sun Aug 29 18:32:29 2021
+++ pkgsrc/chat/prosody/files/prosody.sh	Thu Jul  7 01:53:00 2022
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: prosody.sh,v 1.2 2021/08/29 18:32:29 khorben Exp $
+# $NetBSD: prosody.sh,v 1.3 2022/07/07 01:53:00 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/${name}.pid"
+pidfile="@VARBASE@/run/prosody/${name}.pid"
 #start_precmd="ulimit -n 2048"
 extra_commands="reload status"
 

--_----------=_1657158780171650--