From nobody Sat Mar 4 18:57:09 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PTYx14LJwz3wLMw; Sat, 4 Mar 2023 18:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PTYx13s5xz3vdk; Sat, 4 Mar 2023 18:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677956229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=meGC726GJeDPcx6AWKIxee9BNw4P/CZV5F5mGYk3FG0=; b=qwCmjbdzGCvgx/2e27L5d6gZdPnHLsijewx/yOOvcXvM5JM0njgEaWoRbKNG23oULdTsTI nHcDsLJtUWtXbpqWVo+ZcVVCpvu6KHsXiHcVRHYUwU4iPAV7SwG8MiufeZPPN0bPatXm7s 6tuCi/ywxOcpRFopaYRUdc56IzznLt15IulS4r/cC47/7+BCAwEmxAbX02FRwNB7nqrWsg t197wj1DA16OLvkN4S2khRgj3qCiBvnt+1Y+oTy3tQ5bBxsBP9fknri2l/bVhayNOpPwmW FlIA/m3MH7tNg/RjbbVO/wm2M0gizwkrUrgZzl4SI4At47P7iK93jtUp7orEpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677956229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=meGC726GJeDPcx6AWKIxee9BNw4P/CZV5F5mGYk3FG0=; b=USDFXXvezkYNb18rrRUXhUdWNfn7hztWnXooC0H1Bhws3XHfHrHMgVuBVhdiNMmUJdE9jT VqycMAuPU2U5ci5si+II1Ivl7mJQFCb54I+UAmgmUJaNonZKDp41/DdlSS53FWhblvrpv/ 99WT0NcgO/yjmA939pCYO8y4zMMwKv4wX7MHTgZeKiFGpXvOX9UBzO3ODzUHp6iEMPKbm4 KkN4PIvBiXImVBxMZJkD5Cck9xDS51Ad0L0hFXlY4mZALau3p4zAyGh32bZeX2/2UcC8Y9 ig5r3CNzKWLucdtbKo6oULiKKT57QbNMQL9S69bEIapUZ3IJv+HaVcr7eWDhfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677956229; a=rsa-sha256; cv=none; b=NBFgvwIQZNkuFnKhPQIJUleJV5wOevYgz6SMnGwN6qDEeJDOe2UH4NqAAF73i1AFvt+Nmm If5QzmUWLq/Y8ET3l+Rk+VQTNkXTCeUaLl9A/KFVMIuU7XhVkOjBb1Y1u6WcQtUpEmqzKl LvR5JVI+xSjTLsMu2Fm62MGAdiaOYYJeKWLuoa+MMrFxr+OnbtD6yWWbGzspUkfYVU/3I1 tUXn7OhB+eXHpdsH/ZYXqWVT2nH8I0MJK/HRTdVPrqN57ZTKIaaXekfFMPMOtbR/1CPOTE MAEz2bUtjcIAi7l8ZZrrp9qCNa5oMq3mptoq81Mccjq459y2qs6TXEhg5ruamw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTYx12vpQzr8J; Sat, 4 Mar 2023 18:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 324Iv971030017; Sat, 4 Mar 2023 18:57:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 324Iv956030016; Sat, 4 Mar 2023 18:57:09 GMT (envelope-from git) Date: Sat, 4 Mar 2023 18:57:09 GMT Message-Id: <202303041857.324Iv956030016@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: cb950867b02e - main - devel/msgpack-{c,cxx}: Update to 6.0.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb950867b02e1b4a9f49fb58dbec1eac46e55970 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=cb950867b02e1b4a9f49fb58dbec1eac46e55970 commit cb950867b02e1b4a9f49fb58dbec1eac46e55970 Author: Adam Weinberger AuthorDate: 2023-03-04 18:50:32 +0000 Commit: Adam Weinberger CommitDate: 2023-03-04 18:57:03 +0000 devel/msgpack-{c,cxx}: Update to 6.0.0 Remember that time two months ago when upstream suddenly changed their library/cmake/header names and didn't tell anybody, or set a deprecation period, or make any sort of warning or announcement of any kind? And then I had to spent a ton of time fixing the breakages? Well, apparently the msgpack team thought it was such a good idea that they did it again. With no warning. And no deprecation period. And no announcements. I'm over it. I'm not chasing their renames across the tree to satisfy upstream's two-second attention span. I'm installing links from all the old names and we can remove them when all the consumers switch to the new locations, which is in approximately never. --- devel/msgpack-c/Makefile | 22 ++++++++++++++++++---- devel/msgpack-c/distinfo | 6 +++--- devel/msgpack-c/pkg-plist | 9 +++++++++ devel/msgpack-cxx/Makefile | 10 +++++++++- devel/msgpack-cxx/distinfo | 6 +++--- devel/msgpack-cxx/pkg-plist | 3 +++ 6 files changed, 45 insertions(+), 11 deletions(-) diff --git a/devel/msgpack-c/Makefile b/devel/msgpack-c/Makefile index 115e600ef4b8..271b4a3c4303 100644 --- a/devel/msgpack-c/Makefile +++ b/devel/msgpack-c/Makefile @@ -1,5 +1,5 @@ PORTNAME= msgpack -PORTVERSION= 5.0.0 +PORTVERSION= 6.0.0 DISTVERSIONPREFIX= c- CATEGORIES= devel PKGNAMESUFFIX= -c @@ -18,10 +18,10 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_PROJECT= msgpack-c -CMAKE_OFF= MSGPACK_BUILD_EXAMPLES +CMAKE_OFF= MSGPACK_BUILD_EXAMPLES MSGPACK_BUILD_TESTS TEST_TARGET= test -.include +.include .if ${ARCH} == "sparc64" # required for __sync _* atomic operations on sparc @@ -31,4 +31,18 @@ USE_GCC= yes pre-test: cd ${WRKSRC} && ${CMAKE_BIN} . && ${MAKE_CMD} -.include +# msgpack keeps changing its name and I'm over it. Link from the old filenames +# until upstream makes up its mind. +post-install: + ${LN} -sf msgpack-c.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/msgpack.pc + + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake/msgpackc +.for tgt in config-version config targets-${CMAKE_BUILD_TYPE:tl} targets + ${LN} -sf ../msgpack-c/msgpack-c-${tgt}.cmake \ + ${STAGEDIR}${PREFIX}/lib/cmake/msgpackc/msgpackc-${tgt}.cmake +.endfor +.for ext in a so so.2 so.2.0.0 + ${LN} -sf libmsgpack-c.${ext} ${STAGEDIR}${PREFIX}/lib/libmsgpackc.${ext} +.endfor + +.include diff --git a/devel/msgpack-c/distinfo b/devel/msgpack-c/distinfo index 4881c8c63acc..c3ea84b24d7b 100644 --- a/devel/msgpack-c/distinfo +++ b/devel/msgpack-c/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673367106 -SHA256 (msgpack-msgpack-c-c-5.0.0_GH0.tar.gz) = a61288a9a46fd3b3b4cbd48a17736a9568b65419141cb536833f9adfe8fc97d7 -SIZE (msgpack-msgpack-c-c-5.0.0_GH0.tar.gz) = 74924 +TIMESTAMP = 1677954366 +SHA256 (msgpack-msgpack-c-c-6.0.0_GH0.tar.gz) = af6f3cf25edb220aa2140b09bb5bdd73ddf00938194bd94ebe5c92090cccb466 +SIZE (msgpack-msgpack-c-c-6.0.0_GH0.tar.gz) = 74953 diff --git a/devel/msgpack-c/pkg-plist b/devel/msgpack-c/pkg-plist index a3b9fe351d6e..365d8134f67d 100644 --- a/devel/msgpack-c/pkg-plist +++ b/devel/msgpack-c/pkg-plist @@ -17,12 +17,21 @@ include/msgpack/version_master.h include/msgpack/vrefbuffer.h include/msgpack/zbuffer.h include/msgpack/zone.h +lib/cmake/msgpack-c/msgpack-c-config-version.cmake +lib/cmake/msgpack-c/msgpack-c-config.cmake +lib/cmake/msgpack-c/msgpack-c-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/msgpack-c/msgpack-c-targets.cmake lib/cmake/msgpackc/msgpackc-config-version.cmake lib/cmake/msgpackc/msgpackc-config.cmake lib/cmake/msgpackc/msgpackc-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/msgpackc/msgpackc-targets.cmake +lib/libmsgpack-c.a +lib/libmsgpack-c.so +lib/libmsgpack-c.so.2 +lib/libmsgpack-c.so.2.0.0 lib/libmsgpackc.a lib/libmsgpackc.so lib/libmsgpackc.so.2 lib/libmsgpackc.so.2.0.0 +libdata/pkgconfig/msgpack-c.pc libdata/pkgconfig/msgpack.pc diff --git a/devel/msgpack-cxx/Makefile b/devel/msgpack-cxx/Makefile index 03293f5a67ea..6e5994983070 100644 --- a/devel/msgpack-cxx/Makefile +++ b/devel/msgpack-cxx/Makefile @@ -1,5 +1,5 @@ PORTNAME= msgpack -PORTVERSION= 5.0.0 +PORTVERSION= 6.0.0 DISTVERSIONPREFIX= cpp- CATEGORIES= devel PKGNAMESUFFIX= -cxx @@ -18,4 +18,12 @@ NO_ARCH= yes CMAKE_OFF= MSGPACK_BUILD_EXAMPLES MSGPACK_USE_BOOST +# Link to original cmake files because upstream keeps changing its name. +post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake/msgpackc-cxx +.for tgt in config-version config targets + ${LN} -sf ../msgpack-cxx/msgpack-cxx-${tgt}.cmake \ + ${STAGEDIR}${PREFIX}/lib/cmake/msgpackc-cxx/msgpackc-cxx-${tgt}.cmake +.endfor + .include diff --git a/devel/msgpack-cxx/distinfo b/devel/msgpack-cxx/distinfo index 965893da750b..2ac681f500e7 100644 --- a/devel/msgpack-cxx/distinfo +++ b/devel/msgpack-cxx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673368164 -SHA256 (msgpack-msgpack-c-cpp-5.0.0_GH0.tar.gz) = bd6b8e255f0a62cf8f50f1d292f979ac8ea9a4aa121938679d6f419d6df70ea3 -SIZE (msgpack-msgpack-c-cpp-5.0.0_GH0.tar.gz) = 472136 +TIMESTAMP = 1677955393 +SHA256 (msgpack-msgpack-c-cpp-6.0.0_GH0.tar.gz) = d02f7ffd28b1d38ab9f5f758c4744fadfae92150461fb8154c98ac49226cff90 +SIZE (msgpack-msgpack-c-cpp-6.0.0_GH0.tar.gz) = 472166 diff --git a/devel/msgpack-cxx/pkg-plist b/devel/msgpack-cxx/pkg-plist index 80ec558f3c3e..c01edfff92c1 100644 --- a/devel/msgpack-cxx/pkg-plist +++ b/devel/msgpack-cxx/pkg-plist @@ -728,6 +728,9 @@ include/msgpack/zbuffer.hpp include/msgpack/zbuffer_decl.hpp include/msgpack/zone.hpp include/msgpack/zone_decl.hpp +lib/cmake/msgpack-cxx/msgpack-cxx-config-version.cmake +lib/cmake/msgpack-cxx/msgpack-cxx-config.cmake +lib/cmake/msgpack-cxx/msgpack-cxx-targets.cmake lib/cmake/msgpackc-cxx/msgpackc-cxx-config-version.cmake lib/cmake/msgpackc-cxx/msgpackc-cxx-config.cmake lib/cmake/msgpackc-cxx/msgpackc-cxx-targets.cmake