diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2022-10-16 21:10:02 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2022-10-16 21:10:02 +0000 |
| commit | 9e03d9958ec94c454641adc956fd3b40188fc925 (patch) | |
| tree | 542d79fa8f02f7ebee1500462ec6a006a095b441 | |
| parent | af630f43455cfc8937c2553e260a4f1a8518bff2 (diff) | |
| download | ports-9e03d9958ec94c454641adc956fd3b40188fc925.tar.gz ports-9e03d9958ec94c454641adc956fd3b40188fc925.zip | |
devel/msgpack: Update and split into C and C++ versions
Upstream now provides msgpack as two separate distributions: a C version
with the traditional libmsgpackc.so library, and a header-only C++
version.
devel/msgpack is now devel/msgpack-c and devel/msgpack-cxx, and its
consumers now point to one or both. Note that it is entirely possible
for both to be required. PORTREVISION bump for all consumers.
In my testing, it's not clear that the MSGPACK option in the mariadb
ports actually does anything. I don't think mariadb is actually linking
against msgpack, even before this commit.
25 files changed, 113 insertions, 60 deletions
@@ -17602,3 +17602,4 @@ multimedia/gstreamer1-transcoder|multimedia/gstreamer1-plugins-bad|2022-10-15|Up devel/py-ipykernel5|devel/py-ipykernel|2022-10-15|ipykernel5 is discontinued, ipykernel is used instead x11-toolkits/libshumate-shortwave|x11-toolkits/libshumate|2022-10-15|No longer used by audio/shortwave orion/misc||2022-10-16|Dead upstream, and fails to build with mpv-0.35 +devel/msgpack|devel/msgpack-c|2022-10-16|MsgPack now separates C and C++ versions diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index 74bd0100347e..d9d85faaaea9 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -1,6 +1,6 @@ PORTNAME?= mariadb PORTVERSION= 10.3.36 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ https://mirror.one.com/${SITESDIR}/ \ @@ -144,7 +144,7 @@ LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MROONGA_IMPLIES= LZ4 -MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack +MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack-c OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index 8ea71128baf7..e20e46b1072d 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -1,6 +1,6 @@ PORTNAME?= mariadb PORTVERSION= 10.4.26 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ https://mirror.one.com/${SITESDIR}/ \ @@ -167,7 +167,7 @@ LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MROONGA_IMPLIES= LZ4 -MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack +MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack-c OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index 5b6ddc5cbafe..c185136b13fa 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -1,6 +1,6 @@ PORTNAME?= mariadb PORTVERSION= 10.5.17 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= \ https://mirror.nodesdirect.com/${SITESDIR}/ \ @@ -177,7 +177,7 @@ LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MROONGA_IMPLIES= LZ4 -MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack +MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack-c OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index e22fc63055fc..49b39a0d7cd0 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -1,6 +1,6 @@ PORTNAME?= mariadb PORTVERSION= 10.6.10 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ https://mirror.one.com/${SITESDIR}/ \ @@ -176,7 +176,7 @@ LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MROONGA_IMPLIES= LZ4 -MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack +MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack-c OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python diff --git a/devel/Makefile b/devel/Makefile index 7fa3b5d25299..5d9709d789e8 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1544,7 +1544,8 @@ SUBDIR += mph SUBDIR += mrc SUBDIR += msbuild - SUBDIR += msgpack + SUBDIR += msgpack-c + SUBDIR += msgpack-cxx SUBDIR += msgpack-d SUBDIR += msgpuck SUBDIR += msitools diff --git a/devel/msgpack/Makefile b/devel/msgpack-c/Makefile index 7f6921491c5e..eac46a6b7e7d 100644 --- a/devel/msgpack/Makefile +++ b/devel/msgpack-c/Makefile @@ -1,7 +1,8 @@ PORTNAME= msgpack -PORTVERSION= 3.3.0 -DISTVERSIONPREFIX= cpp- +PORTVERSION= 4.0.0 +DISTVERSIONPREFIX= c- CATEGORIES= devel +PKGNAMESUFFIX= -c MAINTAINER= adamw@FreeBSD.org COMMENT= Efficient binary serialization, like JSON but smaller and faster diff --git a/devel/msgpack-c/distinfo b/devel/msgpack-c/distinfo new file mode 100644 index 000000000000..17e2628f6d25 --- /dev/null +++ b/devel/msgpack-c/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1665951311 +SHA256 (msgpack-msgpack-c-c-4.0.0_GH0.tar.gz) = 656ebe4566845e7bda9c097b625ba59ac72ddfd45df6017172d46d9ac7365aa3 +SIZE (msgpack-msgpack-c-c-4.0.0_GH0.tar.gz) = 74827 diff --git a/devel/msgpack/pkg-descr b/devel/msgpack-c/pkg-descr index adc53ab5b24f..adc53ab5b24f 100644 --- a/devel/msgpack/pkg-descr +++ b/devel/msgpack-c/pkg-descr diff --git a/devel/msgpack-c/pkg-plist b/devel/msgpack-c/pkg-plist new file mode 100644 index 000000000000..318b6ac6b8e0 --- /dev/null +++ b/devel/msgpack-c/pkg-plist @@ -0,0 +1,28 @@ +include/msgpack.h +include/msgpack/fbuffer.h +include/msgpack/gcc_atomic.h +include/msgpack/object.h +include/msgpack/pack.h +include/msgpack/pack_define.h +include/msgpack/pack_template.h +include/msgpack/sbuffer.h +include/msgpack/sysdep.h +include/msgpack/timestamp.h +include/msgpack/unpack.h +include/msgpack/unpack_define.h +include/msgpack/unpack_template.h +include/msgpack/util.h +include/msgpack/version.h +include/msgpack/version_master.h +include/msgpack/vrefbuffer.h +include/msgpack/zbuffer.h +include/msgpack/zone.h +lib/cmake/msgpack/msgpack-config-version.cmake +lib/cmake/msgpack/msgpack-config.cmake +lib/cmake/msgpack/msgpack-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/msgpack/msgpack-targets.cmake +lib/libmsgpackc.a +lib/libmsgpackc.so +lib/libmsgpackc.so.2 +lib/libmsgpackc.so.2.0.0 +libdata/pkgconfig/msgpack.pc diff --git a/devel/msgpack-cxx/Makefile b/devel/msgpack-cxx/Makefile new file mode 100644 index 000000000000..15c2c828240f --- /dev/null +++ b/devel/msgpack-cxx/Makefile @@ -0,0 +1,21 @@ +PORTNAME= msgpack +PORTVERSION= 4.1.2 +DISTVERSIONPREFIX= cpp- +CATEGORIES= devel +PKGNAMESUFFIX= -cxx + +MAINTAINER= adamw@FreeBSD.org +COMMENT= Efficient binary serialization protocol (C++ version) +WWW= https://msgpack.org/ + +LICENSE= BSL +LICENSE_FILE= ${WRKSRC}/LICENSE_1_0.txt + +USES= cmake pathfix +USE_GITHUB= yes +GH_PROJECT= msgpack-c +NO_ARCH= yes + +CMAKE_OFF= MSGPACK_BUILD_EXAMPLES MSGPACK_USE_BOOST + +.include <bsd.port.mk> diff --git a/devel/msgpack-cxx/distinfo b/devel/msgpack-cxx/distinfo new file mode 100644 index 000000000000..7274c9970f24 --- /dev/null +++ b/devel/msgpack-cxx/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1665951428 +SHA256 (msgpack-msgpack-c-cpp-4.1.2_GH0.tar.gz) = 7460ad43552c9d9b56a75f20e1f4fedf18fff1c48715d6cfa91d779b26ca3795 +SIZE (msgpack-msgpack-c-cpp-4.1.2_GH0.tar.gz) = 471931 diff --git a/devel/msgpack-cxx/pkg-descr b/devel/msgpack-cxx/pkg-descr new file mode 100644 index 000000000000..987d3513438c --- /dev/null +++ b/devel/msgpack-cxx/pkg-descr @@ -0,0 +1,7 @@ +MessagePack is an efficient binary serialization format, which lets you +exchange data among multiple languages like JSON, except that it's faster and +smaller. Small integers are encoded into a single byte and short strings +require only one extra byte in addition to the strings themselves. + +This package provides C++ support. It is header-only and uses boost for all +the heavy lifting. diff --git a/devel/msgpack/pkg-plist b/devel/msgpack-cxx/pkg-plist index b05b371bcd34..2f38d6667f63 100644 --- a/devel/msgpack/pkg-plist +++ b/devel/msgpack-cxx/pkg-plist @@ -1,4 +1,3 @@ -include/msgpack.h include/msgpack.hpp include/msgpack/adaptor/adaptor_base.hpp include/msgpack/adaptor/adaptor_base_decl.hpp @@ -15,6 +14,7 @@ include/msgpack/adaptor/carray.hpp include/msgpack/adaptor/char_ptr.hpp include/msgpack/adaptor/check_container_size.hpp include/msgpack/adaptor/check_container_size_decl.hpp +include/msgpack/adaptor/complex.hpp include/msgpack/adaptor/cpp11/array.hpp include/msgpack/adaptor/cpp11/array_char.hpp include/msgpack/adaptor/cpp11/array_unsigned_char.hpp @@ -27,11 +27,13 @@ include/msgpack/adaptor/cpp11/tuple.hpp include/msgpack/adaptor/cpp11/unique_ptr.hpp include/msgpack/adaptor/cpp11/unordered_map.hpp include/msgpack/adaptor/cpp11/unordered_set.hpp +include/msgpack/adaptor/cpp17/array_byte.hpp include/msgpack/adaptor/cpp17/byte.hpp include/msgpack/adaptor/cpp17/carray_byte.hpp include/msgpack/adaptor/cpp17/optional.hpp include/msgpack/adaptor/cpp17/string_view.hpp include/msgpack/adaptor/cpp17/vector_byte.hpp +include/msgpack/adaptor/cpp20/span.hpp include/msgpack/adaptor/define.hpp include/msgpack/adaptor/define_decl.hpp include/msgpack/adaptor/deque.hpp @@ -65,14 +67,14 @@ include/msgpack/adaptor/vector_bool.hpp include/msgpack/adaptor/vector_char.hpp include/msgpack/adaptor/vector_unsigned_char.hpp include/msgpack/adaptor/wstring.hpp +include/msgpack/assert.hpp include/msgpack/cpp_config.hpp include/msgpack/cpp_config_decl.hpp +include/msgpack/cpp_version.hpp include/msgpack/create_object_visitor.hpp include/msgpack/create_object_visitor_decl.hpp -include/msgpack/fbuffer.h include/msgpack/fbuffer.hpp include/msgpack/fbuffer_decl.hpp -include/msgpack/gcc_atomic.h include/msgpack/gcc_atomic.hpp include/msgpack/iterator.hpp include/msgpack/iterator_decl.hpp @@ -80,16 +82,12 @@ include/msgpack/meta.hpp include/msgpack/meta_decl.hpp include/msgpack/null_visitor.hpp include/msgpack/null_visitor_decl.hpp -include/msgpack/object.h include/msgpack/object.hpp include/msgpack/object_decl.hpp include/msgpack/object_fwd.hpp include/msgpack/object_fwd_decl.hpp -include/msgpack/pack.h include/msgpack/pack.hpp include/msgpack/pack_decl.hpp -include/msgpack/pack_define.h -include/msgpack/pack_template.h include/msgpack/parse.hpp include/msgpack/parse_decl.hpp include/msgpack/parse_return.hpp @@ -502,19 +500,14 @@ include/msgpack/preprocessor/variadic/to_seq.hpp include/msgpack/preprocessor/variadic/to_tuple.hpp include/msgpack/preprocessor/while.hpp include/msgpack/preprocessor/wstringize.hpp -include/msgpack/sbuffer.h include/msgpack/sbuffer.hpp include/msgpack/sbuffer_decl.hpp -include/msgpack/sysdep.h -include/msgpack/timestamp.h +include/msgpack/sysdep.hpp include/msgpack/type.hpp -include/msgpack/unpack.h include/msgpack/unpack.hpp include/msgpack/unpack_decl.hpp -include/msgpack/unpack_define.h +include/msgpack/unpack_define.hpp include/msgpack/unpack_exception.hpp -include/msgpack/unpack_template.h -include/msgpack/util.h include/msgpack/v1/adaptor/adaptor_base.hpp include/msgpack/v1/adaptor/adaptor_base_decl.hpp include/msgpack/v1/adaptor/array_ref.hpp @@ -530,6 +523,7 @@ include/msgpack/v1/adaptor/carray.hpp include/msgpack/v1/adaptor/char_ptr.hpp include/msgpack/v1/adaptor/check_container_size.hpp include/msgpack/v1/adaptor/check_container_size_decl.hpp +include/msgpack/v1/adaptor/complex.hpp include/msgpack/v1/adaptor/cpp11/array.hpp include/msgpack/v1/adaptor/cpp11/array_char.hpp include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp @@ -542,11 +536,13 @@ include/msgpack/v1/adaptor/cpp11/tuple.hpp include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp include/msgpack/v1/adaptor/cpp11/unordered_map.hpp include/msgpack/v1/adaptor/cpp11/unordered_set.hpp +include/msgpack/v1/adaptor/cpp17/array_byte.hpp include/msgpack/v1/adaptor/cpp17/byte.hpp include/msgpack/v1/adaptor/cpp17/carray_byte.hpp include/msgpack/v1/adaptor/cpp17/optional.hpp include/msgpack/v1/adaptor/cpp17/string_view.hpp include/msgpack/v1/adaptor/cpp17/vector_byte.hpp +include/msgpack/v1/adaptor/cpp20/span.hpp include/msgpack/v1/adaptor/define.hpp include/msgpack/v1/adaptor/define_decl.hpp include/msgpack/v1/adaptor/deque.hpp @@ -612,7 +608,6 @@ include/msgpack/v1/object_fwd_decl.hpp include/msgpack/v1/pack.hpp include/msgpack/v1/pack_decl.hpp include/msgpack/v1/parse_return.hpp -include/msgpack/v1/preprocessor.hpp include/msgpack/v1/sbuffer.hpp include/msgpack/v1/sbuffer_decl.hpp include/msgpack/v1/unpack.hpp @@ -720,29 +715,19 @@ include/msgpack/v3/x3_unpack.hpp include/msgpack/v3/x3_unpack_decl.hpp include/msgpack/v3/zbuffer_decl.hpp include/msgpack/v3/zone_decl.hpp -include/msgpack/version.h include/msgpack/version.hpp -include/msgpack/version_master.h +include/msgpack/version_master.hpp include/msgpack/versioning.hpp -include/msgpack/vrefbuffer.h include/msgpack/vrefbuffer.hpp include/msgpack/vrefbuffer_decl.hpp include/msgpack/x3_parse.hpp include/msgpack/x3_parse_decl.hpp include/msgpack/x3_unpack.hpp include/msgpack/x3_unpack_decl.hpp -include/msgpack/zbuffer.h include/msgpack/zbuffer.hpp include/msgpack/zbuffer_decl.hpp -include/msgpack/zone.h include/msgpack/zone.hpp include/msgpack/zone_decl.hpp -lib/cmake/msgpack/msgpack-config-version.cmake -lib/cmake/msgpack/msgpack-config.cmake -lib/cmake/msgpack/msgpack-targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/msgpack/msgpack-targets.cmake -lib/libmsgpackc.a -lib/libmsgpackc.so -lib/libmsgpackc.so.2 -lib/libmsgpackc.so.2.0.0 -libdata/pkgconfig/msgpack.pc +lib/cmake/msgpackc-cxx/msgpack-config-version.cmake +lib/cmake/msgpackc-cxx/msgpack-config.cmake +lib/cmake/msgpackc-cxx/msgpackc-cxx-targets.cmake diff --git a/devel/msgpack/distinfo b/devel/msgpack/distinfo deleted file mode 100644 index 1dcc44de7da0..000000000000 --- a/devel/msgpack/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1591344930 -SHA256 (msgpack-msgpack-c-cpp-3.3.0_GH0.tar.gz) = 754c3ace499a63e45b77ef4bcab4ee602c2c414f58403bce826b76ffc2f77d0b -SIZE (msgpack-msgpack-c-cpp-3.3.0_GH0.tar.gz) = 504674 diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile index 8441cafacec3..8abe82fa3735 100644 --- a/devel/opendht/Makefile +++ b/devel/opendht/Makefile @@ -1,6 +1,6 @@ PORTNAME= opendht DISTVERSION= 1.10.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel net MAINTAINER= yuri@FreeBSD.org @@ -10,9 +10,11 @@ WWW= https://github.com/savoirfairelinux/opendht/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ + msgpack-cxx>4.0.0:devel/msgpack-cxx LIB_DEPENDS= libargon2.so:security/libargon2 \ libjsoncpp.so:devel/jsoncpp \ - libmsgpackc.so:devel/msgpack \ + libmsgpackc.so:devel/msgpack-c \ libnettle.so:security/nettle \ libgnutls.so:security/gnutls diff --git a/devel/p5-Data-MessagePack-Stream/Makefile b/devel/p5-Data-MessagePack-Stream/Makefile index ba07d2f50051..fc491d06d3cd 100644 --- a/devel/p5-Data-MessagePack-Stream/Makefile +++ b/devel/p5-Data-MessagePack-Stream/Makefile @@ -12,11 +12,10 @@ BROKEN_mips= fails to build: atomic operations are not found BROKEN_mips64= fails to build: atomic operations are not found BROKEN_sparc64= fails to build: atomic operations are not found -BUILD_DEPENDS= msgpack>=3.3.0:devel/msgpack \ - p5-File-Which>=0:sysutils/p5-File-Which \ +BUILD_DEPENDS= p5-File-Which>=0:sysutils/p5-File-Which \ p5-Module-Build-XSUtil>=0:devel/p5-Module-Build-XSUtil \ ${RUN_DEPENDS} -LIB_DEPENDS= libmsgpackc.so:devel/msgpack +LIB_DEPENDS= libmsgpackc.so:devel/msgpack-c RUN_DEPENDS= p5-Data-MessagePack>=0:devel/p5-Data-MessagePack USES= localbase:ldflags perl5 diff --git a/editors/neovim-qt/Makefile b/editors/neovim-qt/Makefile index 2b72356fca02..21ecc6a39308 100644 --- a/editors/neovim-qt/Makefile +++ b/editors/neovim-qt/Makefile @@ -1,6 +1,7 @@ PORTNAME= neovim-qt DISTVERSIONPREFIX= v DISTVERSION= 0.2.17 +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= eduardo@FreeBSD.org @@ -12,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= neovim>=0:editors/neovim \ unibilium>=0:devel/unibilium -LIB_DEPENDS= libmsgpackc.so:devel/msgpack \ +LIB_DEPENDS= libmsgpackc.so:devel/msgpack-c \ libunibilium.so:devel/unibilium RUN_DEPENDS= neovim>=0:editors/neovim diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile index e7ae2e81ef67..c59921b92b76 100644 --- a/editors/neovim/Makefile +++ b/editors/neovim/Makefile @@ -1,7 +1,7 @@ PORTNAME= neovim DISTVERSIONPREFIX= v DISTVERSION= 0.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MAINTAINER= adamw@FreeBSD.org @@ -14,7 +14,7 @@ BUILD_DEPENDS= gperf:devel/gperf \ ${LUA_MODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \ ${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR} LIB_DEPENDS= libluv.so:devel/luv \ - libmsgpackc.so:devel/msgpack \ + libmsgpackc.so:devel/msgpack-c \ libtermkey.so:devel/libtermkey \ libtree-sitter.so:devel/tree-sitter \ libunibilium.so:devel/unibilium \ diff --git a/misc/veles/Makefile b/misc/veles/Makefile index 6987683274ad..69c9deafb8c1 100644 --- a/misc/veles/Makefile +++ b/misc/veles/Makefile @@ -1,6 +1,6 @@ PORTNAME= veles DISTVERSION= 2018.05.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ @@ -19,7 +19,8 @@ PYTHON_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} -BUILD_DEPENDS= msgpack>0:devel/msgpack \ +BUILD_DEPENDS= msgpack>0:devel/msgpack-c \ + msgpack-cxx>0:devel/msgpack-cxx \ ${PYTHON_DEPENDS} RUN_DEPENDS= ${PYTHON_DEPENDS} diff --git a/science/mmtf-cpp/Makefile b/science/mmtf-cpp/Makefile index 325838f234fa..01db9e8db41f 100644 --- a/science/mmtf-cpp/Makefile +++ b/science/mmtf-cpp/Makefile @@ -1,6 +1,7 @@ PORTNAME= mmtf-cpp DISTVERSIONPREFIX= v DISTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= science biology MAINTAINER= yuri@FreeBSD.org @@ -10,7 +11,7 @@ WWW= https://mmtf.rcsb.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${LOCALBASE}/include/msgpack.hpp:devel/msgpack +RUN_DEPENDS= ${LOCALBASE}/include/msgpack.hpp:devel/msgpack-cxx TEST_DEPENDS= catch>0:devel/catch USES= cmake:testing compiler:c++11-lang localbase:ldflags diff --git a/science/py-pymol/Makefile b/science/py-pymol/Makefile index 557a96a73151..d65a765b6bd3 100644 --- a/science/py-pymol/Makefile +++ b/science/py-pymol/Makefile @@ -1,7 +1,7 @@ PORTNAME= pymol DISTVERSIONPREFIX= v DISTVERSION= 2.4.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= science biology python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${PYNUMPY} \ ${LOCALBASE}/include/mmtf.hpp:science/mmtf-cpp LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ - libmsgpackc.so:devel/msgpack \ + libmsgpackc.so:devel/msgpack-c \ libnetcdf.so:science/netcdf RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw@${PY_FLAVOR} \ diff --git a/sysutils/tmate-ssh-server/Makefile b/sysutils/tmate-ssh-server/Makefile index 3644e4d91819..2497f81b0cb5 100644 --- a/sysutils/tmate-ssh-server/Makefile +++ b/sysutils/tmate-ssh-server/Makefile @@ -1,6 +1,7 @@ PORTNAME= tmate-ssh-server PORTVERSION= g2020071601 PORTEPOCH= 1 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= swills@FreeBSD.org @@ -8,7 +9,7 @@ COMMENT= Instant terminal sharing server WWW= https://tmate.io/ LIB_DEPENDS= libevent.so:devel/libevent \ - libmsgpackc.so:devel/msgpack \ + libmsgpackc.so:devel/msgpack-c \ libssh.so:security/libssh USES= autoreconf compiler:c11 ncurses pkgconfig diff --git a/sysutils/tmate/Makefile b/sysutils/tmate/Makefile index e9cb950887d2..f9d4c66ef599 100644 --- a/sysutils/tmate/Makefile +++ b/sysutils/tmate/Makefile @@ -1,6 +1,6 @@ PORTNAME= tmate PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= swills@FreeBSD.org @@ -8,7 +8,7 @@ COMMENT= Instant terminal sharing WWW= https://tmate.io/ LIB_DEPENDS= libevent.so:devel/libevent \ - libmsgpackc.so:devel/msgpack \ + libmsgpackc.so:devel/msgpack-c \ libssh.so:security/libssh USES= autoreconf compiler:c11 ncurses pkgconfig diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile index f8370f58ae6b..524e618bf999 100644 --- a/textproc/groonga/Makefile +++ b/textproc/groonga/Makefile @@ -1,5 +1,6 @@ PORTNAME= groonga PORTVERSION= 12.0.8 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://packages.groonga.org/source/groonga/ @@ -44,7 +45,7 @@ RUBY_RUN_DEPENDS= rubygem-bundler>=0:sysutils/rubygem-bundler RUBY_USE= RUBY=yes RUBY_CONFIGURE_ON= --enable-mruby SUGGEST_LIB_DEPENDS= libevent.so:devel/libevent \ - libmsgpackc.so:devel/msgpack \ + libmsgpackc.so:devel/msgpack-c \ libzmq.so:net/libzmq2 SUGGEST_CONFIGURE_ON= --enable-zeromq \ --with-libevent=${LOCALBASE} \ |