diff options
| author | khorben <khorben@pkgsrc.org> | 2022-07-07 01:53:00 +0000 |
|---|---|---|
| committer | khorben <khorben@pkgsrc.org> | 2022-07-07 01:53:00 +0000 |
| commit | e414da09514cb7837243e4f29c975bf386011032 (patch) | |
| tree | 80971e3d643109fc4599204ab21a5af26bfb1f79 /chat | |
| parent | d1695c445b79ab82329f6c8cc1c7196af4983267 (diff) | |
| download | pkgsrc-e414da09514cb7837243e4f29c975bf386011032.tar.gz | |
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
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/prosody/Makefile | 7 | ||||
| -rw-r--r-- | chat/prosody/files/prosody.sh | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/chat/prosody/Makefile b/chat/prosody/Makefile index 7ccdb43a9ae..cbbc0a26b2a 100644 --- a/chat/prosody/Makefile +++ b/chat/prosody/Makefile @@ -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:../../net/lua-socket 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} diff --git a/chat/prosody/files/prosody.sh b/chat/prosody/files/prosody.sh index f8fd2c411c1..fdab7f62b69 100644 --- a/chat/prosody/files/prosody.sh +++ b/chat/prosody/files/prosody.sh @@ -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" |