Received: by mail.netbsd.org (Postfix, from userid 605) id 89B4084D33; Tue, 17 Dec 2019 01:58:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 12D5584C6C for ; Tue, 17 Dec 2019 01:58:25 +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 LSBEBQbd9_dL for ; Tue, 17 Dec 2019 01:58:24 +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 767A784C2B for ; Tue, 17 Dec 2019 01:58:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6A112FA97; Tue, 17 Dec 2019 01:58:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1576547904261770" MIME-Version: 1.0 Date: Tue, 17 Dec 2019 01:58:24 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/devel/asio To: pkgsrc-changes@NetBSD.org Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20191217015824.6A112FA97@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. --_----------=_1576547904261770 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gutteridge Date: Tue Dec 17 01:58:24 UTC 2019 Modified Files: pkgsrc/devel/asio: Makefile distinfo Added Files: pkgsrc/devel/asio/patches: patch-include_asio_detail_impl_kqueue__reactor.ipp Log Message: asio: build fix for NetBSD > 9.99.14 Carry over the same patch from the Boost meta-pkg to fix this same file in this version of the asio implementation. (The patch looks a little ungainly in isolation, but is simpler than creating multiple #if/#else blocks in the target file.) (TBD: this package is likely redundant, as a newer version of it is subsumed within the Boost libraries. The only package depending on it is abiword-plugins. At first glance, it appears that abiword-plugins could simply be patched to reference the Boost namespace for this functionality. But I haven't confirmed if there are any specific functional gaps between the two implementations, so I'm making this quick build fix for now.) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/asio/Makefile \ pkgsrc/devel/asio/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/asio/patches/patch-include_asio_detail_impl_kqueue__reactor.ipp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1576547904261770 Content-Disposition: inline Content-Length: 2343 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/asio/Makefile diff -u pkgsrc/devel/asio/Makefile:1.3 pkgsrc/devel/asio/Makefile:1.4 --- pkgsrc/devel/asio/Makefile:1.3 Sun Oct 2 22:04:37 2016 +++ pkgsrc/devel/asio/Makefile Tue Dec 17 01:58:24 2019 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2016/10/02 22:04:37 prlw1 Exp $ +# $NetBSD: Makefile,v 1.4 2019/12/17 01:58:24 gutteridge Exp $ DISTNAME= asio-1.10.8 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=asio/} EXTRACT_SUFX= .tar.bz2 Index: pkgsrc/devel/asio/distinfo diff -u pkgsrc/devel/asio/distinfo:1.3 pkgsrc/devel/asio/distinfo:1.4 --- pkgsrc/devel/asio/distinfo:1.3 Sun Oct 2 22:04:37 2016 +++ pkgsrc/devel/asio/distinfo Tue Dec 17 01:58:24 2019 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2016/10/02 22:04:37 prlw1 Exp $ +$NetBSD: distinfo,v 1.4 2019/12/17 01:58:24 gutteridge Exp $ SHA1 (asio-1.10.8.tar.bz2) = 07dde049a1bb975decccf499b08c2bf03e966895 RMD160 (asio-1.10.8.tar.bz2) = 938970e6c001393e4822d5aa89db36d24929dc9a SHA512 (asio-1.10.8.tar.bz2) = d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09 Size (asio-1.10.8.tar.bz2) = 1270332 bytes +SHA1 (patch-include_asio_detail_impl_kqueue__reactor.ipp) = 74d0dc164117c5b684a1bdfa2faad1dff57302b3 Added files: Index: pkgsrc/devel/asio/patches/patch-include_asio_detail_impl_kqueue__reactor.ipp diff -u /dev/null pkgsrc/devel/asio/patches/patch-include_asio_detail_impl_kqueue__reactor.ipp:1.1 --- /dev/null Tue Dec 17 01:58:24 2019 +++ pkgsrc/devel/asio/patches/patch-include_asio_detail_impl_kqueue__reactor.ipp Tue Dec 17 01:58:24 2019 @@ -0,0 +1,17 @@ +$NetBSD: patch-include_asio_detail_impl_kqueue__reactor.ipp,v 1.1 2019/12/17 01:58:24 gutteridge Exp $ + +* Fix build with recent NetBSD 9.99 + +--- include/asio/detail/impl/kqueue_reactor.ipp.orig 2016-09-18 22:24:38.000000000 +0000 ++++ include/asio/detail/impl/kqueue_reactor.ipp +@@ -27,6 +27,10 @@ + #include "asio/detail/push_options.hpp" + + #if defined(__NetBSD__) ++#include ++#endif ++ ++#if defined(__NetBSD__) && __NetBSD_Version__ < 999001500 + # define ASIO_KQUEUE_EV_SET(ev, ident, filt, flags, fflags, data, udata) \ + EV_SET(ev, ident, filt, flags, fflags, data, \ + reinterpret_cast(static_cast(udata))) --_----------=_1576547904261770--