mosquitto: Revamp example config files handling

diff --git a/mosquitto/Makefile b/mosquitto/Makefile
index 89eb62c9e250346f0d72e0d8b9a5a4d351cca480..94bbb896597c96925234ca61eafe6c466ec407a6 100644 (file)
--- 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 851390e07a0c7b57c66756f58b217f77fe638bcd..972d583327616a11991d97fe78dac593a627da2a 100644 (file)
--- a/mosquitto/TODO
+++ b/mosquitto/TODO
@@ -1,4 +1,2 @@
-* conf files (see Makefile)
-
 * resolve patches (see patch files)