CVS commit: pkgsrc/net/mosquitto

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Oct 14 21:51:21 UTC 2024

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

Log Message:
net/mosquitto: GC workaround for libwebsockets cmake bug

libwebsockets now installs a more reasonable cmake file for use by
depending packages.  Don't worry about requiring the new version,
because the problem was most likely just a warning anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/mosquitto/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/net/mosquitto/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt

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.38 pkgsrc/net/mosquitto/Makefile:1.39
--- pkgsrc/net/mosquitto/Makefile:1.38  Sun Oct 13 16:30:00 2024
+++ pkgsrc/net/mosquitto/Makefile       Mon Oct 14 21:51:21 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2024/10/13 16:30:00 gdt Exp $
+# $NetBSD: Makefile,v 1.39 2024/10/14 21:51:21 gdt Exp $
 
 DISTNAME=      mosquitto-2.0.19
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  https://mosquitto.org/files/source/
 

Index: pkgsrc/net/mosquitto/distinfo
diff -u pkgsrc/net/mosquitto/distinfo:1.32 pkgsrc/net/mosquitto/distinfo:1.33
--- pkgsrc/net/mosquitto/distinfo:1.32  Mon Oct 14 21:27:44 2024
+++ pkgsrc/net/mosquitto/distinfo       Mon Oct 14 21:51:21 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2024/10/14 21:27:44 gdt Exp $
+$NetBSD: distinfo,v 1.33 2024/10/14 21:51:21 gdt Exp $
 
 BLAKE2s (mosquitto-2.0.19.tar.gz) = bed44b4f1a969e997b512adb0ba86078c8cfe43ddd1195531d7b6f5273c5563f
 SHA512 (mosquitto-2.0.19.tar.gz) = ea716c1fd8dd7dc60e2f0bf5c2f0f5b98f73d1ea404420c755aff82ba2e70e54e0fe19bd045be8322971d290111ee556830e7f71da7cdcf27917f393d1fa7238
@@ -9,4 +9,4 @@ SHA1 (patch-lib_CMakeLists.txt) = a1b132
 SHA1 (patch-lib_net__mosq.c) = fdf488984e3b902473f28d6e3482169788c0d517
 SHA1 (patch-lib_strings__mosq.c) = fb290d7766328d6aa1e935adec9c0fad2eb11c4b
 SHA1 (patch-mosquitto.conf) = 3aa9b02d8bfefa140814c2c70e120331a58a5e11
-SHA1 (patch-src_CMakeLists.txt) = aac198d154e85527349302b32f78a7027164422b
+SHA1 (patch-src_CMakeLists.txt) = ad906a507fcd39ac4fdcf98afde75ff715101698

Index: pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt:1.7 pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt:1.8
--- pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt:1.7   Sun Oct 13 14:13:23 2024
+++ pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt       Mon Oct 14 21:51:21 2024
@@ -1,22 +1,10 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.7 2024/10/13 14:13:23 gdt Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.8 2024/10/14 21:51:21 gdt Exp $
 
-The first hunk avoids some cmake magic, which buggily adds -ldl on NetBSD.
-\todo File a bug against pkgsrc websockets, perhaps cascading to upstream.
-
-The second hunk removes linker args on SunOS, for no apparent reason.
+The first hunk removes linker args on SunOS, for no apparent reason.
 \todo Explain and file a bug upstream; this should not be a pkgsrc change.
 
 --- src/CMakeLists.txt.orig    2020-08-19 13:55:03.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -200,7 +200,7 @@
-                       link_directories(${mosquitto_SOURCE_DIR})
-               endif (WIN32)
-       else (STATIC_WEBSOCKETS)
--              set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared)
-+              set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
-       endif (STATIC_WEBSOCKETS)
- endif (WITH_WEBSOCKETS)
- 
 @@ -213,9 +213,9 @@ target_link_libraries(mosquitto ${MOSQ_L
  if (UNIX)
        if (APPLE)