pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mosquitto: Revamp example config files handling



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Jun 30 19:02:27 2019 -0400
Changeset:	5e375bb8ecc475e97e8c181cde31f5fe10948506

Modified Files:
	mosquitto/Makefile
	mosquitto/TODO

Log Message:
mosquitto: Revamp example config files handling

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5e375bb8ecc475e97e8c181cde31f5fe10948506

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

diffstat:
 mosquitto/Makefile | 10 +++++-----
 mosquitto/TODO     |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diffs:
diff --git a/mosquitto/Makefile b/mosquitto/Makefile
index 89eb62c9e2..94bbb89659 100644
--- a/mosquitto/Makefile
+++ b/mosquitto/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 VERSION=	1.6.3
+PKGREVISION=	1
 DISTNAME=	mosquitto-${VERSION}
 CATEGORIES=	net
 MASTER_SITES=	https://mosquitto.org/files/source/
@@ -20,11 +21,10 @@ USE_TOOLS+=	gmake
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/share/examples
 
-# \todo Resolve what is an example vs. what might be used.
-CONF_FILES=	${PREFIX}/share/examples/mosquitto/pskfile.example \
-		${PREFIX}/share/examples/mosquitto/pwfile.example \
-		${PREFIX}/share/examples/mosquitto/mosquitto.conf \
-		${PREFIX}/share/examples/mosquitto/aclfile.example
+# \todo The example file is vast and arguably should not be installed.
+# However, we need to set a few things to make automatic startup work.
+CONF_FILES=	${PREFIX}/share/examples/mosquitto/mosquitto.conf \
+		${PKG_SYSCONFDIR}/mosquitto.conf
 
 # Fails; see https://github.com/eclipse/mosquitto/issues/1242
 TEST_TARGET=	test
diff --git a/mosquitto/TODO b/mosquitto/TODO
index 851390e07a..972d583327 100644
--- a/mosquitto/TODO
+++ b/mosquitto/TODO
@@ -1,4 +1,2 @@
-* conf files (see Makefile)
-
 * resolve patches (see patch files)
 


Home | Main Index | Thread Index | Old Index