Re: [UPDATE] devel/msgpack-6.0.0
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 - 1.18
> +++ Makefile 3 Feb 2024 06:57:19 -
> @@ -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 - 1.6
> +++ distinfo 3 Feb 2024 06:57:19 -
> @@ -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 - 1.6
> +++ pkg/PLIST 3 Feb 2024 06:57:19 -
> @@ -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 - 1.42
> +++ Makefile 3 Feb 2024 07:16:28 -
> @@ -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 - 1.9
> +++ Makefile 3 Feb 2024 07:48:42 -
> @@ -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 - 1.21
> +++ Makefile 3 Feb 2024 09:29:58 -
> @@ -4,7 +4,7 @@ GH_ACCOUNT = tmate-io
> GH_PROJE
Re: [UPDATE] devel/msgpack-6.0.0
On Sat, Feb 03, 2024 at 06:33:41PM +0900, SASANO Takayoshi wrote: > > editors/neovim Looks fine to me. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
Re: [UPDATE] devel/msgpack-6.0.0
On Sat, Feb 03, 2024 at 06:33:41PM +0900, SASANO Takayoshi wrote: Hello Takayoshi, >> 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. I've updated msgack, neovim, and neovim-qt with your diffs, and all have survived light testing. From my perspective these are all good to go. Laurie
Re: [UPDATE] devel/msgpack-6.0.0
(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
--- Makefile21 Sep 2023 09:50:01 - 1.18
+++ Makefile3 Feb 2024 06:57:19 -
@@ -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
--- distinfo2 Sep 2023 11:10:13 - 1.6
+++ distinfo3 Feb 2024 06:57:19 -
@@ -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 - 1.6
+++ pkg/PLIST 3 Feb 2024 06:57:19 -
@@ -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
--- Makefile17 Jan 2024 14:17:59 - 1.42
+++ Makefile3 Feb 2024 07:16:28 -
@@ -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
--- Makefile14 Dec 2023 12:20:32 - 1.9
+++ Makefile3 Feb 2024 07:48:42 -
@@ -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 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 -
+++ patches/patch-configure-ac 3 Feb 2024 09:29:58 -
@@ -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
Re: [UPDATE] devel/msgpack-6.0.0
On 2024/02/02 21:28, SASANO Takayoshi wrote:
> Hi,
>
> here is the msgpack-5.0.0 -> 6.0.0 update.
>
> From this release, the name "msgpackc" become "msgpack-c"
> (see https://github.com/msgpack/msgpack-c/releases/tag/c-6.0.0),
> this might widely affect I think.
>
> Should we update this library?
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
> And, I want to add msgpack-cxx (for C++) to build OpenDHT,
> is this port conbined into devel/msgpack or devel/msgpack-cxx?
> (msgpack-cxx is 6.1.0, and no msgpack-c 6.1.0).
msgpack-c and msgpack-cxx are separate distributions, it makes most
sense to use separate ports.
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/msgpack/Makefile,v
> diff -u -p -r1.18 Makefile
> --- Makefile 21 Sep 2023 09:50:01 - 1.18
> +++ Makefile 2 Feb 2024 12:19:12 -
> @@ -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 2.0 # 2.0
the name changes, so that can go back to 0.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 - 1.6
> +++ distinfo 2 Feb 2024 12:19:12 -
> @@ -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 - 1.6
> +++ pkg/PLIST 2 Feb 2024 12:19:12 -
> @@ -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
>
> --
> SASANO Takayoshi (JG1UAA)
>
Re: UPDATE devel/msgpack
> > Sorry to make you do more work, but: > > 1. Could you eliminate -Werror in all the patches? It's in one but not the > > other. > > > > 2. There are some more -O3 floating around. For example: > > Thanks for reviewing! > > I missed the remaining -O3, and didn't think that using -Werror is not > preferred. Output 'make test' after removing these flags: > > 100% tests passed, 0 tests failed out of 30 > > Instead of patching 4 files I'm using sed. I think it's fair enough to use sed for this. OK with me The main problem with -Werror is that some of the older compilers warn on things which newer ones find acceptable, so you're at risk of builds failing needlessly on the very arches where it's harder to get tests done.
Re: UPDATE devel/msgpack
On Thu 15/02/2018 23:14, Brian Callahan wrote:
>
> On 02/15/18 23:01, Björn Ketelaars wrote:
> > On Fri 09/02/2018 18:29, Björn Ketelaars wrote:
> > > On Fri 09/02/2018 17:09, Stuart Henderson wrote:
> > > > On 2018/02/09 07:55, Björn Ketelaars wrote:
> > > > > Included a diff for bringing devel/msgpack to 2.1.5. From CHANGELOG:
> > > > >
> > > > > - Improve cross platform configuration
> > > > > - Add boost asio examples (including zlib)
> > > > > - Remove some warnings
> > > > > - Fix unpack visitor to treat float32/64 correctly
> > > > > - Improve documents
> > > > > - Fix alignment problem on some platform
> > > > > - Fix conflict std::tuple, std::pair, and boost::fusion::sequence
> > > > > problem
> > > > >
> > > > > While here drop GH_ in favour of MASTER_SITES, and switch HOMEPAGE to
> > > > > https. No need to bump SHARED_LIBS.
> > > > GH_* is correct here.
> > > >
> > > > /archive -> GH_*
> > > > /releases -> MASTER_SITES
> > New diff, which includes sthen@'s comment, and excludes the reordering of
> > Makefile. Output make test:
> >
> > 100% tests passed, 0 tests failed out of 30
> >
> > Build tested both consumers (editors/neovim and sysutils/tmate). Run
> > tested with editors/neovim.
> >
> > OK?
>
> Sorry to make you do more work, but:
> 1. Could you eliminate -Werror in all the patches? It's in one but not the
> other.
>
> 2. There are some more -O3 floating around. For example:
Thanks for reviewing!
I missed the remaining -O3, and didn't think that using -Werror is not
preferred. Output 'make test' after removing these flags:
100% tests passed, 0 tests failed out of 30
Instead of patching 4 files I'm using sed.
OK?
Index: Makefile
===
RCS file: /cvs/ports/devel/msgpack/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile20 Jan 2018 14:03:39 - 1.8
+++ Makefile16 Feb 2018 11:31:08 -
@@ -2,13 +2,13 @@
COMMENT = MessagePack implementation for C and C++
-V =2.1.4
+V =2.1.5
DISTNAME = msgpack-${V}
SHARED_LIBS += msgpackc 1.0 # 2.0
CATEGORIES = devel
-HOMEPAGE = http://msgpack.org/
+HOMEPAGE = https://msgpack.org/
# Boost license
PERMIT_PACKAGE_CDROM = Yes
@@ -21,5 +21,11 @@ MODULES =devel/cmake
BUILD_DEPENDS =devel/gtest
TEST_DEPENDS = devel/gtest
+
+pre-configure:
+ cd ${WRKSRC} && sed -i 's,-Werror -g -O3,,' CMakeLists.txt \
+ example/c/CMakeLists.txt \
+ example/cpp03/CMakeLists.txt \
+ test/CMakeLists.txt
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/msgpack/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo9 Aug 2017 23:02:22 - 1.4
+++ distinfo16 Feb 2018 11:31:08 -
@@ -1,2 +1,2 @@
-SHA256 (msgpack-2.1.4.tar.gz) = DjufGzKWf4m0FuAor+LH98wI4middd4i8HrZtNsU9a4=
-SIZE (msgpack-2.1.4.tar.gz) = 460891
+SHA256 (msgpack-2.1.5.tar.gz) = nIf4D8ZRuQB3LervCrFUtjFgx00pJSm1vm0G1khdRkA=
+SIZE (msgpack-2.1.5.tar.gz) = 461179
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt16 Jun 2017 18:55:07 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.3 2017/06/16 18:55:07 jasper Exp $
-
-Kill -g -O3.
-
-Index: CMakeLists.txt
CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -237,9 +237,9 @@ ENDIF ()
-
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}"
STREQUAL "GNU")
- IF (MSGPACK_ENABLE_SHARED)
--SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS
"-Wall -Wextra -Werror -g -O3 -DPIC")
-+SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS
"-Wall -Wextra -Werror -DPIC")
- ENDIF ()
--SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS
"-Wall -Wextra -Werror -g -O3" )
-+SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS
"-Wall -Wextra -Werror" )
- ENDIF ()
-
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
Index: patches/patch-test_CMakeLists_txt
===
RCS file: patches/patch-test_CMakeLists_txt
diff -N patches/patch-test_CMakeLists_txt
--- patches/patch-test_CMakeLists_txt 16 Jun 2017 18:55:07 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-test_CMakeLists_txt,v 1.3 2017/06/16 18:55:07 jasper Exp $
-
-Kill -g -O3. Kill -Werror, as gtest header makes warnings.
-
-Index: test/CMakeLists.txt
test/CMakeLists.txt.orig
-+++ test/CMakeLists.txt
-@@ -86,7 +86,7 @@ FOREACH (source_file ${c
Re: UPDATE devel/msgpack
On 02/15/18 23:01, Björn Ketelaars wrote:
On Fri 09/02/2018 18:29, Björn Ketelaars wrote:
On Fri 09/02/2018 17:09, Stuart Henderson wrote:
On 2018/02/09 07:55, Björn Ketelaars wrote:
Included a diff for bringing devel/msgpack to 2.1.5. From CHANGELOG:
- Improve cross platform configuration
- Add boost asio examples (including zlib)
- Remove some warnings
- Fix unpack visitor to treat float32/64 correctly
- Improve documents
- Fix alignment problem on some platform
- Fix conflict std::tuple, std::pair, and boost::fusion::sequence problem
While here drop GH_ in favour of MASTER_SITES, and switch HOMEPAGE to
https. No need to bump SHARED_LIBS.
GH_* is correct here.
/archive -> GH_*
/releases -> MASTER_SITES
New diff, which includes sthen@'s comment, and excludes the reordering of
Makefile. Output make test:
100% tests passed, 0 tests failed out of 30
Build tested both consumers (editors/neovim and sysutils/tmate). Run
tested with editors/neovim.
OK?
Sorry to make you do more work, but:
1. Could you eliminate -Werror in all the patches? It's in one but not
the other.
2. There are some more -O3 floating around. For example:
[6/104] /usr/ports/pobj/msgpack-2.1.5/bin/c++
-I/usr/ports/pobj/msgpack-2.1.5/msgpack-c-cpp-2.1.5/include -Iinclude
-DMSGPACK_DEFAULT_API_VERSION=2 -std=c++98 -O2 -pipe -DNDEBUG -Wall
-Wextra -Werror -g -O3 -MD -MT
example/cpp03/CMakeFiles/protocol_new.dir/protocol_new.cpp.o -MF
example/cpp03/CMakeFiles/protocol_new.dir/protocol_new.cpp.o.d -o
example/cpp03/CMakeFiles/protocol_new.dir/protocol_new.cpp.o -c
/usr/ports/pobj/msgpack-2.1.5/msgpack-c-cpp-2.1.5/example/cpp03/protocol_new.cpp
~Brian
Index: Makefile
===
RCS file: /cvs/ports/devel/msgpack/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile20 Jan 2018 14:03:39 - 1.8
+++ Makefile15 Feb 2018 20:56:24 -
@@ -2,13 +2,13 @@
COMMENT = MessagePack implementation for C and C++
-V = 2.1.4
+V =2.1.5
DISTNAME =msgpack-${V}
SHARED_LIBS +=msgpackc 1.0 # 2.0
CATEGORIES = devel
-HOMEPAGE = http://msgpack.org/
+HOMEPAGE = https://msgpack.org/
# Boost license
PERMIT_PACKAGE_CDROM =Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/msgpack/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo9 Aug 2017 23:02:22 - 1.4
+++ distinfo15 Feb 2018 20:56:24 -
@@ -1,2 +1,2 @@
-SHA256 (msgpack-2.1.4.tar.gz) = DjufGzKWf4m0FuAor+LH98wI4middd4i8HrZtNsU9a4=
-SIZE (msgpack-2.1.4.tar.gz) = 460891
+SHA256 (msgpack-2.1.5.tar.gz) = nIf4D8ZRuQB3LervCrFUtjFgx00pJSm1vm0G1khdRkA=
+SIZE (msgpack-2.1.5.tar.gz) = 461179
Re: UPDATE devel/msgpack
On Fri 09/02/2018 18:29, Björn Ketelaars wrote:
> On Fri 09/02/2018 17:09, Stuart Henderson wrote:
> > On 2018/02/09 07:55, Björn Ketelaars wrote:
> > > Included a diff for bringing devel/msgpack to 2.1.5. From CHANGELOG:
> > >
> > > - Improve cross platform configuration
> > > - Add boost asio examples (including zlib)
> > > - Remove some warnings
> > > - Fix unpack visitor to treat float32/64 correctly
> > > - Improve documents
> > > - Fix alignment problem on some platform
> > > - Fix conflict std::tuple, std::pair, and boost::fusion::sequence problem
> > >
> > > While here drop GH_ in favour of MASTER_SITES, and switch HOMEPAGE to
> > > https. No need to bump SHARED_LIBS.
> >
> > GH_* is correct here.
> >
> > /archive -> GH_*
> > /releases -> MASTER_SITES
New diff, which includes sthen@'s comment, and excludes the reordering of
Makefile. Output make test:
100% tests passed, 0 tests failed out of 30
Build tested both consumers (editors/neovim and sysutils/tmate). Run
tested with editors/neovim.
OK?
Index: Makefile
===
RCS file: /cvs/ports/devel/msgpack/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile20 Jan 2018 14:03:39 - 1.8
+++ Makefile15 Feb 2018 20:56:24 -
@@ -2,13 +2,13 @@
COMMENT = MessagePack implementation for C and C++
-V =2.1.4
+V =2.1.5
DISTNAME = msgpack-${V}
SHARED_LIBS += msgpackc 1.0 # 2.0
CATEGORIES = devel
-HOMEPAGE = http://msgpack.org/
+HOMEPAGE = https://msgpack.org/
# Boost license
PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/msgpack/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo9 Aug 2017 23:02:22 - 1.4
+++ distinfo15 Feb 2018 20:56:24 -
@@ -1,2 +1,2 @@
-SHA256 (msgpack-2.1.4.tar.gz) = DjufGzKWf4m0FuAor+LH98wI4middd4i8HrZtNsU9a4=
-SIZE (msgpack-2.1.4.tar.gz) = 460891
+SHA256 (msgpack-2.1.5.tar.gz) = nIf4D8ZRuQB3LervCrFUtjFgx00pJSm1vm0G1khdRkA=
+SIZE (msgpack-2.1.5.tar.gz) = 461179
Re: UPDATE devel/msgpack
On Fri 09/02/2018 17:09, Stuart Henderson wrote:
> On 2018/02/09 07:55, Björn Ketelaars wrote:
> > Included a diff for bringing devel/msgpack to 2.1.5. From CHANGELOG:
> >
> > - Improve cross platform configuration
> > - Add boost asio examples (including zlib)
> > - Remove some warnings
> > - Fix unpack visitor to treat float32/64 correctly
> > - Improve documents
> > - Fix alignment problem on some platform
> > - Fix conflict std::tuple, std::pair, and boost::fusion::sequence problem
> >
> > While here drop GH_ in favour of MASTER_SITES, and switch HOMEPAGE to
> > https. No need to bump SHARED_LIBS.
>
> GH_* is correct here.
>
> /archive -> GH_*
> /releases -> MASTER_SITES
>
New diff
diff --git Makefile Makefile
index 501ae93053c..cd44917b61a 100644
--- Makefile
+++ Makefile
@@ -2,23 +2,22 @@
COMMENT = MessagePack implementation for C and C++
-V =2.1.4
+V =2.1.5
DISTNAME = msgpack-${V}
-SHARED_LIBS += msgpackc 1.0 # 2.0
+GH_ACCOUNT = msgpack
+GH_PROJECT = msgpack-c
+GH_TAGNAME = cpp-${V}
+
+SHARED_LIBS = msgpackc 1.0 # 2.0
CATEGORIES = devel
-HOMEPAGE = http://msgpack.org/
+HOMEPAGE = https://msgpack.org/
# Boost license
PERMIT_PACKAGE_CDROM = Yes
-GH_ACCOUNT = msgpack
-GH_PROJECT = msgpack-c
-GH_TAGNAME = cpp-${V}
-
MODULES = devel/cmake
-
BUILD_DEPENDS =devel/gtest
TEST_DEPENDS = devel/gtest
diff --git distinfo distinfo
index 594baa27160..e33cc64a0c4 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (msgpack-2.1.4.tar.gz) = DjufGzKWf4m0FuAor+LH98wI4middd4i8HrZtNsU9a4=
-SIZE (msgpack-2.1.4.tar.gz) = 460891
+SHA256 (msgpack-2.1.5.tar.gz) = nIf4D8ZRuQB3LervCrFUtjFgx00pJSm1vm0G1khdRkA=
+SIZE (msgpack-2.1.5.tar.gz) = 461179
Re: UPDATE devel/msgpack
On 2018/02/09 07:55, Björn Ketelaars wrote: > Included a diff for bringing devel/msgpack to 2.1.5. From CHANGELOG: > > - Improve cross platform configuration > - Add boost asio examples (including zlib) > - Remove some warnings > - Fix unpack visitor to treat float32/64 correctly > - Improve documents > - Fix alignment problem on some platform > - Fix conflict std::tuple, std::pair, and boost::fusion::sequence problem > > While here drop GH_ in favour of MASTER_SITES, and switch HOMEPAGE to > https. No need to bump SHARED_LIBS. GH_* is correct here. /archive -> GH_* /releases -> MASTER_SITES
