Received: by mail.netbsd.org (Postfix, from userid 605) id 80B0A84E33; Tue, 11 Aug 2020 18:06:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0839984D02 for ; Tue, 11 Aug 2020 18:06:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id HWMi8yEt-ouR for ; Tue, 11 Aug 2020 18:06:10 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 80B8784CFC for ; Tue, 11 Aug 2020 18:06:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 72838FB28; Tue, 11 Aug 2020 18:06:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159716917022480" MIME-Version: 1.0 Date: Tue, 11 Aug 2020 18:06:10 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/net/mosquitto To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20200811180610.72838FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_159716917022480 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Tue Aug 11 18:06:10 UTC 2020 Modified Files: pkgsrc/net/mosquitto: distinfo pkgsrc/net/mosquitto/patches: patch-src_CMakeLists.txt Log Message: net/mosquitto: Adjust patch comments (NFC) Hunk to drop -ldl on NetBSD has been applied upstream. Add \todo items on hunk about SunOS ldflags to 1) explain the change and 2) file it upstream. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/mosquitto/distinfo cvs rdiff -u -r1.3 -r1.4 \ 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. --_----------=_159716917022480 Content-Disposition: inline Content-Length: 1855 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/mosquitto/distinfo diff -u pkgsrc/net/mosquitto/distinfo:1.9 pkgsrc/net/mosquitto/distinfo:1.10 --- pkgsrc/net/mosquitto/distinfo:1.9 Tue Aug 11 12:26:41 2020 +++ pkgsrc/net/mosquitto/distinfo Tue Aug 11 18:06:10 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2020/08/11 12:26:41 gdt Exp $ +$NetBSD: distinfo,v 1.10 2020/08/11 18:06:10 gdt Exp $ SHA1 (mosquitto-1.6.11.tar.gz) = 0b80f39363a87d22b17d76eb0a5016c92fa5d865 RMD160 (mosquitto-1.6.11.tar.gz) = 4e887495a340d1b1c5228aced8e641a03cd9bed5 @@ -7,4 +7,4 @@ Size (mosquitto-1.6.11.tar.gz) = 610563 SHA1 (patch-lib_CMakeLists.txt) = cddb8803a759820c8059028f924b56c22689ee54 SHA1 (patch-lib_net__mosq.c) = a38294cdfea98f2da0879ea93373c5f04aebdb20 SHA1 (patch-mosquitto.conf) = ca82a8a1bdc59d5e6f4121d8474693245b923789 -SHA1 (patch-src_CMakeLists.txt) = abcd6c11f0b6831c3155104b43e8ce654f0b42b8 +SHA1 (patch-src_CMakeLists.txt) = b0c7cfe7744ae3f1f8dfe92929a09e6ca1ef17cb Index: pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt diff -u pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt:1.3 pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt:1.4 --- pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt:1.3 Tue Aug 11 12:26:41 2020 +++ pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt Tue Aug 11 18:06:10 2020 @@ -1,8 +1,18 @@ -$NetBSD: patch-src_CMakeLists.txt,v 1.3 2020/08/11 12:26:41 gdt Exp $ +$NetBSD: patch-src_CMakeLists.txt,v 1.4 2020/08/11 18:06:10 gdt Exp $ -On NetBSD, don't use -ldl (why?). +* hunk 1 -Sent upstream via email 20190427. +On NetBSD, don't use -ldl + +Sent upstream via email 20190427, again on 20200811, and applied +upstream on +20200811. + +* hunk 2 + +\todo Explain why this hunk is here. + +\todo File hunk upstream. --- src/CMakeLists.txt.orig 2020-08-11 11:18:06.000000000 +0000 +++ src/CMakeLists.txt --_----------=_159716917022480--