CVS commit: pkgsrc/net/mosquitto

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Feb  1 20:50:02 UTC 2021

Modified Files:
        pkgsrc/net/mosquitto: Makefile
        pkgsrc/net/mosquitto/files: mosquitto.sh

Log Message:
mosquitto: Fix the hardcoded /var in rcd script


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/mosquitto/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/mosquitto/files/mosquitto.sh

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

Modified files:

Index: pkgsrc/net/mosquitto/Makefile
diff -u pkgsrc/net/mosquitto/Makefile:1.17 pkgsrc/net/mosquitto/Makefile:1.18
--- pkgsrc/net/mosquitto/Makefile:1.17  Sat Jan 30 10:17:55 2021
+++ pkgsrc/net/mosquitto/Makefile       Mon Feb  1 20:50:01 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/01/30 10:17:55 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2021/02/01 20:50:01 triaxx Exp $
 
 DISTNAME=      mosquitto-2.0.6
 CATEGORIES=    net
@@ -41,6 +41,7 @@ SMF_METHODS=  mosquitto
 FILES_SUBST+=  MOSQUITTO_USER=${MOSQUITTO_USER}
 FILES_SUBST+=  MOSQUITTO_GROUP=${MOSQUITTO_GROUP}
 FILES_SUBST+=  PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+FILES_SUBST+= VARBASE=${VARBASE}
 
 # mosquitto's build system is very troubled, and the tests do not
 # currently work.

Index: pkgsrc/net/mosquitto/files/mosquitto.sh
diff -u pkgsrc/net/mosquitto/files/mosquitto.sh:1.4 pkgsrc/net/mosquitto/files/mosquitto.sh:1.5
--- pkgsrc/net/mosquitto/files/mosquitto.sh:1.4 Mon Feb  1 16:43:53 2021
+++ pkgsrc/net/mosquitto/files/mosquitto.sh     Mon Feb  1 20:50:01 2021
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mosquitto.sh,v 1.4 2021/02/01 16:43:53 triaxx Exp $
+# $NetBSD: mosquitto.sh,v 1.5 2021/02/01 20:50:01 triaxx Exp $
 #
 # PROVIDE: mosquitto
 # REQUIRE: DAEMON
@@ -10,7 +10,7 @@
 name="mosquitto"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
-piddir="/var/run/${name}"
+piddir="@VARBASE@/run/${name}"
 pidfile="${piddir}/${name}.pid"
 config="@PKG_SYSCONFDIR@/${name}.conf"