CVS commit: pkgsrc/net/mosquitto

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 19 19:11:36 UTC 2024

Modified Files:
        pkgsrc/net/mosquitto: Makefile distinfo
        pkgsrc/net/mosquitto/patches: patch-mosquitto.conf

Log Message:
mosquitto: convert to cmake/build.mk

add TOOL_DEPENDS on docbook-xsl, unclear why this was not needed before
remove gmake from tools, unused

Fix some pkglint while here.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/mosquitto/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/mosquitto/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/mosquitto/patches/patch-mosquitto.conf

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.34 pkgsrc/net/mosquitto/Makefile:1.35
--- pkgsrc/net/mosquitto/Makefile:1.34  Tue Oct 24 22:10:24 2023
+++ pkgsrc/net/mosquitto/Makefile       Mon Aug 19 19:11:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2023/10/24 22:10:24 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2024/08/19 19:11:36 wiz Exp $
 
 DISTNAME=      mosquitto-2.0.18
 PKGREVISION=   1
@@ -11,13 +11,9 @@ COMMENT=     Open Source MQTT broker
 LICENSE=       epl-v1.0
 
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
+TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
 USE_LANGUAGES+=        c c++
-# Upstream documents that "unix" should use make, but Mac cmake.
-# After asking and receiving no guidance, choose to always use cmake.
-# https://github.com/eclipse/mosquitto/issues/1041
-USE_CMAKE=     yes
-USE_TOOLS+=    gmake
 
 LDFLAGS.SunOS+=        -lsocket -lnsl
 CMAKE_ARGS+=   -DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/share/examples
@@ -43,11 +39,17 @@ 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}
+FILES_SUBST+=  VARBASE=${VARBASE}
 
+BUILD_DEFS+=   VARBASE
 PTHREAD_AUTO_VARS=     yes
 .include "../../mk/pthread.buildlink3.mk"
 
+# Upstream documents that "unix" should use make, but Mac cmake.
+# After asking and receiving no guidance, choose to always use cmake.
+# https://github.com/eclipse/mosquitto/issues/1041
+.include "../../devel/cmake/build.mk"
+
 # mosquitto's build system is very troubled, and the tests do not
 # currently work.
 #   https://github.com/eclipse/mosquitto/issues/1242
@@ -58,7 +60,7 @@ PTHREAD_AUTO_VARS=    yes
 TEST_TARGET=   test
 .include "../../devel/cunit/buildlink3.mk"
 
-.include "options.mk"   
+.include "options.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/uthash/buildlink3.mk"
 .include "../../net/libcares/buildlink3.mk"

Index: pkgsrc/net/mosquitto/distinfo
diff -u pkgsrc/net/mosquitto/distinfo:1.29 pkgsrc/net/mosquitto/distinfo:1.30
--- pkgsrc/net/mosquitto/distinfo:1.29  Mon Sep 18 22:10:19 2023
+++ pkgsrc/net/mosquitto/distinfo       Mon Aug 19 19:11:36 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2023/09/18 22:10:19 gdt Exp $
+$NetBSD: distinfo,v 1.30 2024/08/19 19:11:36 wiz Exp $
 
 BLAKE2s (mosquitto-2.0.18.tar.gz) = 19191973bd7b7c299d8ebb478b9c57c57c802a4f80f5d5406069df45113a4486
 SHA512 (mosquitto-2.0.18.tar.gz) = 63f7e2811964bab5856848e6918627c47afc6534ff60aad5ece3d2fa330b407c9df14027610826e343ee68ff7d8d5d93f2459713061251ded478c42766946767
@@ -6,5 +6,5 @@ Size (mosquitto-2.0.18.tar.gz) = 796351 
 SHA1 (patch-lib_CMakeLists.txt) = 81981f812dc38572e727a9a5dfb427b80476702d
 SHA1 (patch-lib_net__mosq.c) = fdf488984e3b902473f28d6e3482169788c0d517
 SHA1 (patch-lib_strings__mosq.c) = fb290d7766328d6aa1e935adec9c0fad2eb11c4b
-SHA1 (patch-mosquitto.conf) = 6091113365a7c1d3d726af30fee682abafc40ab0
+SHA1 (patch-mosquitto.conf) = 3aa9b02d8bfefa140814c2c70e120331a58a5e11
 SHA1 (patch-src_CMakeLists.txt) = d0425fd674f2cd1a992a36e616dc8b29e130550b

Index: pkgsrc/net/mosquitto/patches/patch-mosquitto.conf
diff -u pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.5 pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.6
--- pkgsrc/net/mosquitto/patches/patch-mosquitto.conf:1.5       Fri Dec 31 09:57:36 2021
+++ pkgsrc/net/mosquitto/patches/patch-mosquitto.conf   Mon Aug 19 19:11:36 2024
@@ -1,4 +1,5 @@
-$NetBSD: patch-mosquitto.conf,v 1.5 2021/12/31 09:57:36 triaxx Exp $
+$NetBSD: patch-mosquitto.conf,v 1.6 2024/08/19 19:11:36 wiz Exp $
+
 Log to syslog, instead of (perhaps) not logging.
 
 \todo Figure out what happens if port is not defined, and why we set it.