From: Stuart Henderson Subject: Re: [UPDATE] devel/msgpack-6.0.0 To: SASANO Takayoshi Cc: edd@openbsd.org, laurie@tratt.net, ports@openbsd.org Date: Mon, 5 Feb 2024 20:38:56 +0000 ok sthen@ On 2024/02/03 18:33, SASANO Takayoshi wrote: > (added neovim/neovim-qt maintainer) > > Hi, > > > It will need doing sometime. It's probably easier to do it sooner rather > > than later before more other ports start using it. > > > > These ports will need changes to adapt: > > > > editors/neovim > > editors/neovim-qt > > sysutils/tmate > > well, here is (simply fixed version that you pointed out in previous mail) > new msgpack 5 -> 6 diff and neovim/neovim-qt/tmate diff. > > ---- devel/msgpack > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/devel/msgpack/Makefile,v > diff -u -p -r1.18 Makefile > --- Makefile 21 Sep 2023 09:50:01 -0000 1.18 > +++ Makefile 3 Feb 2024 06:57:19 -0000 > @@ -1,10 +1,10 @@ > COMMENT = MessagePack implementation for C and C++ > > -V = 5.0.0 > +V = 6.0.0 > DISTNAME = msgpack-c-${V} > PKGNAME = msgpack-${V} > > -SHARED_LIBS += msgpackc 2.0 # 2.0 > +SHARED_LIBS += msgpack-c 0.0 # 2.0 > > CATEGORIES = devel > > @@ -21,7 +21,7 @@ BUILD_DEPENDS = devel/gtest>=1.11.0pl20 > TEST_DEPENDS = devel/gtest>=1.11.0pl20220208 > > # evertyhing except tests > -ALL_TARGET = msgpackc msgpackc-static > +ALL_TARGET = msgpack-c msgpack-c-static > > # build whatever is left (ca. 22 C++ test files) > pre-test: > Index: distinfo > =================================================================== > RCS file: /cvs/ports/devel/msgpack/distinfo,v > diff -u -p -r1.6 distinfo > --- distinfo 2 Sep 2023 11:10:13 -0000 1.6 > +++ distinfo 3 Feb 2024 06:57:19 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (msgpack-c-5.0.0.tar.gz) = 62138y26qukXTZbKz+Aq8wvx6jKcRQGAdM2VrG5vpuU= > -SIZE (msgpack-c-5.0.0.tar.gz) = 69275 > +SHA256 (msgpack-c-6.0.0.tar.gz) = NlT14sZS3FLgqZPicLtX1XArJicD8DdxwVK7pRYCrro= > +SIZE (msgpack-c-6.0.0.tar.gz) = 69341 > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/devel/msgpack/pkg/PLIST,v > diff -u -p -r1.6 PLIST > --- pkg/PLIST 2 Sep 2023 11:10:13 -0000 1.6 > +++ pkg/PLIST 3 Feb 2024 06:57:19 -0000 > @@ -19,11 +19,11 @@ include/msgpack/vrefbuffer.h > include/msgpack/zbuffer.h > include/msgpack/zone.h > lib/cmake/ > -lib/cmake/msgpackc/ > -lib/cmake/msgpackc/msgpackc-config-version.cmake > -lib/cmake/msgpackc/msgpackc-config.cmake > -lib/cmake/msgpackc/msgpackc-targets${MODCMAKE_BUILD_SUFFIX} > -lib/cmake/msgpackc/msgpackc-targets.cmake > -@static-lib lib/libmsgpackc.a > -@lib lib/libmsgpackc.so.${LIBmsgpackc_VERSION} > -lib/pkgconfig/msgpack.pc > +lib/cmake/msgpack-c/ > +lib/cmake/msgpack-c/msgpack-c-config-version.cmake > +lib/cmake/msgpack-c/msgpack-c-config.cmake > +lib/cmake/msgpack-c/msgpack-c-targets${MODCMAKE_BUILD_SUFFIX} > +lib/cmake/msgpack-c/msgpack-c-targets.cmake > +@static-lib lib/libmsgpack-c.a > +@lib lib/libmsgpack-c.so.${LIBmsgpack-c_VERSION} > +lib/pkgconfig/msgpack-c.pc > > > ---- editors/neovim > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/editors/neovim/Makefile,v > diff -u -p -r1.42 Makefile > --- Makefile 17 Jan 2024 14:17:59 -0000 1.42 > +++ Makefile 3 Feb 2024 07:16:28 -0000 > @@ -17,6 +17,7 @@ DIST_TUPLE = github neovim neovim v0.9.5 > USE_NOBTCFI = Yes > > CATEGORIES = editors devel > +REVISION = 0 > HOMEPAGE = https://neovim.io > MAINTAINER = Edd Barrett > > @@ -40,7 +41,7 @@ PERMIT_PACKAGE = Yes > > DEBUG_PACKAGES = ${BUILD_PACKAGES} > > -WANTLIB += c iconv intl m msgpackc pthread termkey > +WANTLIB += c iconv intl m msgpack-c pthread termkey > WANTLIB += tree-sitter unibilium util uv vterm > > .if ${EMBED_LUAJIT} != "Yes" > > > ---- editors/neovim-qt > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/editors/neovim-qt/Makefile,v > diff -u -p -r1.9 Makefile > --- Makefile 14 Dec 2023 12:20:32 -0000 1.9 > +++ Makefile 3 Feb 2024 07:48:42 -0000 > @@ -3,6 +3,7 @@ COMMENT = Qt5 GUI front-end for neovim > GH_ACCOUNT = equalsraf > GH_PROJECT = neovim-qt > GH_TAGNAME = v0.2.18 > +REVISION = 0 > > CATEGORIES = editors > > @@ -14,7 +15,7 @@ MAINTAINER = Laurence Tratt PERMIT_PACKAGE = Yes > > WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Network Qt5Svg > -WANTLIB += Qt5Widgets c m msgpackc > +WANTLIB += Qt5Widgets c m msgpack-c > > MODULES = devel/cmake \ > lang/python \ > > > ---- sysutils/tame > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/sysutils/tmate/Makefile,v > diff -u -p -r1.21 Makefile > --- Makefile 25 Sep 2023 17:07:36 -0000 1.21 > +++ Makefile 3 Feb 2024 09:29:58 -0000 > @@ -4,7 +4,7 @@ GH_ACCOUNT = tmate-io > GH_PROJECT = tmate > GH_TAGNAME = 2.4.0 > CATEGORIES = sysutils > -REVISION = 6 > +REVISION = 7 > > SITES.p = https://github.com/tmate-io/tmate/commit/ > PATCHFILES.p = tmate-bad-fingerprint{cbec43f56dfb48c2fb6e00faa2cb85443d4b7d8f}.patch \ > @@ -18,7 +18,7 @@ PERMIT_PACKAGE = Yes > > # uses pledge() > > -WANTLIB = c curses event_core event_extra execinfo msgpackc ssh util > +WANTLIB = c curses event_core event_extra execinfo msgpack-c ssh util > > LIB_DEPENDS = devel/libevent2 \ > devel/msgpack \ > Index: patches/patch-configure-ac > =================================================================== > RCS file: patches/patch-configure-ac > diff -N patches/patch-configure-ac > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-configure-ac 3 Feb 2024 09:29:58 -0000 > @@ -0,0 +1,20 @@ > +--- configure.ac.orig Sun Nov 17 07:09:38 2019 > ++++ configure.ac Sat Feb 3 15:47:48 2024 > +@@ -201,7 +201,7 @@ fi > + > + PKG_CHECK_MODULES( > + MSGPACK, > +- msgpack >= 1.1.0, > ++ msgpack-c >= 1.1.0, > + [ > + CPPFLAGS="$MSGPACK_CFLAGS $CPPFLAGS" > + LIBS="$MSGPACK_LIBS $LIBS" > +@@ -210,7 +210,7 @@ PKG_CHECK_MODULES( > + found_msgpack=no > + ) > + if test "x$found_msgpack" = xno; then > +- AC_MSG_ERROR("msgpack >= 1.1.0 not found") > ++ AC_MSG_ERROR("msgpack-c >= 1.1.0 not found") > + fi > + > + PKG_CHECK_MODULES( > > -- > SASANO Takayoshi (JG1UAA)