CVS commit: pkgsrc/net/nanomsg

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Aug 30 14:34:36 UTC 2023

Modified Files:
        pkgsrc/net/nanomsg: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/nanomsg/patches: patch-src_aio_poller__kqueue.inc

Log Message:
nanomsg: updated to 1.2

Version 1.2 Minor Feature Release

This adds support for IPv6 and fixes a couple of bugs.

Please remember that this project is in sustaining mode only, so some bugs remain unfixed.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/nanomsg/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/nanomsg/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/nanomsg/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/nanomsg/patches/patch-src_aio_poller__kqueue.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/nanomsg/Makefile
diff -u pkgsrc/net/nanomsg/Makefile:1.5 pkgsrc/net/nanomsg/Makefile:1.6
--- pkgsrc/net/nanomsg/Makefile:1.5     Tue Dec 28 12:04:09 2021
+++ pkgsrc/net/nanomsg/Makefile Wed Aug 30 14:34:36 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2021/12/28 12:04:09 adam Exp $
+# $NetBSD: Makefile,v 1.6 2023/08/30 14:34:36 adam Exp $
 
-DISTNAME=      nanomsg-1.1.5
+DISTNAME=      nanomsg-1.2
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=nanomsg/}
 
@@ -9,11 +9,14 @@ HOMEPAGE=     https://nanomsg.org/
 COMMENT=       Scalability protocols library
 LICENSE=       x11
 
-USE_CMAKE=     yes
-TEST_TARGET=   test
+USE_LANGUAGES= c
+
+TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
 # For Darwin
-TEST_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}
+TEST_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
+TEST_TARGET=   test
 
 PKGCONFIG_OVERRIDE+=   src/pkgconfig.in
 
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/nanomsg/PLIST
diff -u pkgsrc/net/nanomsg/PLIST:1.2 pkgsrc/net/nanomsg/PLIST:1.3
--- pkgsrc/net/nanomsg/PLIST:1.2        Tue Dec 28 12:04:09 2021
+++ pkgsrc/net/nanomsg/PLIST    Wed Aug 30 14:34:36 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/12/28 12:04:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/08/30 14:34:36 adam Exp $
 bin/nanocat
 include/nanomsg/bus.h
 include/nanomsg/inproc.h
@@ -11,11 +11,11 @@ include/nanomsg/reqrep.h
 include/nanomsg/survey.h
 include/nanomsg/tcp.h
 include/nanomsg/ws.h
-lib/cmake/${PKGNAME}/nanomsg-config-version.cmake
-lib/cmake/${PKGNAME}/nanomsg-config.cmake
-lib/cmake/${PKGNAME}/nanomsg-target-noconfig.cmake
-lib/cmake/${PKGNAME}/nanomsg-target.cmake
+lib/cmake/nanomsg-1.1.5/nanomsg-config-version.cmake
+lib/cmake/nanomsg-1.1.5/nanomsg-config.cmake
+lib/cmake/nanomsg-1.1.5/nanomsg-target-noconfig.cmake
+lib/cmake/nanomsg-1.1.5/nanomsg-target.cmake
 lib/libnanomsg.so
-lib/libnanomsg.so.5
-lib/libnanomsg.so.5.1.0
+lib/libnanomsg.so.6
+lib/libnanomsg.so.6.0.1
 lib/pkgconfig/nanomsg.pc

Index: pkgsrc/net/nanomsg/distinfo
diff -u pkgsrc/net/nanomsg/distinfo:1.4 pkgsrc/net/nanomsg/distinfo:1.5
--- pkgsrc/net/nanomsg/distinfo:1.4     Tue Dec 28 12:04:09 2021
+++ pkgsrc/net/nanomsg/distinfo Wed Aug 30 14:34:36 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/12/28 12:04:09 adam Exp $
+$NetBSD: distinfo,v 1.5 2023/08/30 14:34:36 adam Exp $
 
-BLAKE2s (nanomsg-1.1.5.tar.gz) = 4aee7ed15ba7e05b194c54e879003627c5693b5c5090ded58532fb9463bd4f72
-SHA512 (nanomsg-1.1.5.tar.gz) = 773b8e169a7accac21414c63972423a249164f5b843c6c65c1b03a2eb90d21da788a98debdeb396dab795e52d30605696bc2cf65e5e05687bf115438d5b22717
-Size (nanomsg-1.1.5.tar.gz) = 310739 bytes
+BLAKE2s (nanomsg-1.2.tar.gz) = d87ce01775b6312d7952551c0a8a25f41465b13a3c91c727f22695328c479267
+SHA512 (nanomsg-1.2.tar.gz) = 377b3a0b4be6d6decd2711ff84ac1855ae0a298e7557dbe4b7d881c2a76f4e521671b47987b924c434afdad7ff1dfebb50982c8c0afca9b44682c898510d4c92
+Size (nanomsg-1.2.tar.gz) = 311041 bytes
+SHA1 (patch-src_aio_poller__kqueue.inc) = 455ec08d811757e0b09cc7d6e4b9961fb9e1b6a6

Added files:

Index: pkgsrc/net/nanomsg/patches/patch-src_aio_poller__kqueue.inc
diff -u /dev/null pkgsrc/net/nanomsg/patches/patch-src_aio_poller__kqueue.inc:1.1
--- /dev/null   Wed Aug 30 14:34:36 2023
+++ pkgsrc/net/nanomsg/patches/patch-src_aio_poller__kqueue.inc Wed Aug 30 14:34:36 2023
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_aio_poller__kqueue.inc,v 1.1 2023/08/30 14:34:36 adam Exp $
+
+Fix for newer NetBSD.
+
+--- src/aio/poller_kqueue.inc.orig     2023-08-30 14:21:45.000000000 +0000
++++ src/aio/poller_kqueue.inc
+@@ -29,10 +29,13 @@
+ 
+ /*  NetBSD has different definition of udata. */
+ #if defined NN_HAVE_NETBSD
++#include <sys/param.h>
++#if __NetBSD_Version__ < 999001400
+ #define nn_poller_udata intptr_t
+ #else
+ #define nn_poller_udata void*
+ #endif
++#endif
+ 
+ int nn_poller_init (struct nn_poller *self)
+ {