macports · suhailskhan · May 2, 2025 · May 2, 2025 · May 2, 2025 · May 9, 2025
diff --git a/R/R-RProtoBuf/Portfile b/R/R-RProtoBuf/Portfile
@@ -3,27 +3,28 @@
 PortSystem          1.0
 PortGroup           R 1.0
 
-R.setup             cran eddelbuettel RProtoBuf 0.4.22
-revision            1
+R.setup             cran eddelbuettel RProtoBuf 0.4.24
+revision            0
 categories-append   devel
 maintainers         {@barracuda156 gmail.com:vital.had} openmaintainer
 license             GPL-2+
 description         R interface to the Protocol Buffers API
 long_description    {*}${description}
 homepage-append     https://dirk.eddelbuettel.com/code/rprotobuf.html
-checksums           rmd160  e9f6d049b1f696a17c9179190400d36fa0c78d23 \
-                    sha256  75b802176722052d1ef2c6b36adff9204ee86fb8f2e1fcecd897571bd8ed8d7e \
-                    size    1010658
+checksums           rmd160  98732fea1e3f14f8fb36984b1f9aa7ace895bfe8 \
+                    sha256  f22c16013d8cbedf5a09bb854ce092466434db740092fc0d7554fb5d33896168 \
+                    size    1013085
 
-if {${os.platform} eq "darwin" && ${os.major} < 16} {
+if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libc++"} {
     # Symbol not found: __ZN6google8protobuf8compiler10SourceTree19GetLastErrorMessageB5cxx11Ev
     patchfiles-append \
                     patch-cxx11.diff
 }
 
 depends_build-append \
-                    port:pkgconfig
-depends_lib-append  port:protobuf3-cpp \
+                    path:bin/pkg-config:pkgconfig
+
+depends_lib-append  port:protobuf \
                     port:R-Rcpp
 
 compiler.cxx_standard 2017

diff --git a/R/R-cld3/Portfile b/R/R-cld3/Portfile
@@ -5,7 +5,7 @@ PortGroup           R 1.0
 
 # GitHub version is old.
 R.setup             cran ropensci cld3 1.6.1
-revision            0
+revision            1
 categories-append   devel
 maintainers         nomaintainer
 license             Apache-2
@@ -19,7 +19,7 @@ checksums           rmd160  60afb8f5c37a0ecf1d418977c0226d74f4bd4e3c \
 depends_build-append \
                     path:bin/pkg-config:pkgconfig
 
-depends_lib-append  port:protobuf3-cpp \
+depends_lib-append  port:protobuf \
                     port:R-Rcpp
 
 if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libc++"} {

diff --git a/R/R-protolite/Portfile b/R/R-protolite/Portfile
@@ -5,7 +5,7 @@ PortGroup           R 1.0
 
 # GitHub version lags behind.
 R.setup             cran jeroen protolite 2.3.1
-revision            0
+revision            1
 categories-append   devel
 maintainers         {@barracuda156 gmail.com:vital.had} openmaintainer
 license             MIT
@@ -27,7 +27,7 @@ if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libc++"} {
 depends_build-append \
                     path:bin/pkg-config:pkgconfig
 
-depends_lib-append  port:protobuf3-cpp \
+depends_lib-append  port:protobuf \
                     port:R-jsonlite \
                     port:R-Rcpp
 

diff --git a/databases/mysql57/Portfile b/databases/mysql57/Portfile
@@ -1,4 +1,4 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4

 PortSystem          1.0
 PortGroup           conflicts_build 1.0
@@ -43,7 +43,7 @@
     # poll-emulator breaks the build, if active:
     # xcom/task.c:744:37: error: 'POLLRDNORM' undeclared (first use in this function)
     # See also: https://trac.macports.org/ticket/38558
-    conflicts_build     boost protobuf3-cpp protobuf-cpp poll-emulator
+    conflicts_build     boost protobuf poll-emulator
 
     distfiles           ${distname}${extract.suffix}:mysql \
                         ${boost_distname}${extract.suffix}:boost

diff --git a/databases/percona/Portfile b/databases/percona/Portfile
@@ -8,8 +8,8 @@ set name_package    ${name}-server
 set version_mysql   8.0.16
 set release         7
 # Please set revision_client and revision_server to 0 if you bump version_mysql or release.
-set revision_client 9
-set revision_server 2
+set revision_client 10
+set revision_server 3
 set boost_version   1.69.0
 version             ${version_mysql}-${release}
 categories          databases
@@ -64,7 +64,7 @@ if {$subport eq $name} {
                         path:lib/pkgconfig/icu-uc.pc:icu \
                         port:libevent \
                         port:lz4 \
-                        port:protobuf3-cpp \
+                        port:protobuf \
                         port:re2 \
                         port:zlib \
                         port:tcp_wrappers

diff --git a/devel/Bear/Portfile b/devel/Bear/Portfile
@@ -11,7 +11,7 @@ legacysupport.use_mp_libcxx                 yes
 
 github.setup        rizsotto Bear 3.1.6
 github.tarball_from archive
-revision            0
+revision            1
 
 checksums           rmd160  41ff322cdbc0c5f15adf17193b586c3dad441230 \
                     sha256  99cd891eec6e89b734d7cafe0e623dd8c2f27d8cbf3ee9bc4807e69e5c8fb55c \
@@ -46,8 +46,9 @@ depends_build-append \
 depends_lib-append  port:abseil \
                     port:grpc \
                     port:${port_libfmt} \
-                    port:protobuf3-cpp
+                    port:protobuf
 
 configure.args-append \
                     -DENABLE_UNIT_TESTS=Off \
-                    -DENABLE_FUNC_TESTS=Off
+                    -DENABLE_FUNC_TESTS=Off \
+                    -DCMAKE_EXE_LINKER_FLAGS="-lgrpc -lgpr"
diff --git a/devel/grpc/Portfile b/devel/grpc/Portfile
@@ -1,16 +1,16 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
 PortGroup           cmake 1.1
+PortGroup           compiler_blacklist_versions 1.0
 PortGroup           github 1.0
 PortGroup           legacysupport 1.1
-PortGroup           compiler_blacklist_versions 1.0
+PortGroup           openssl 1.0
 
 # NOTE: Also rev-bump 'apache-arrow' when updating this port
-github.setup        grpc grpc 1.48.4 v
-# Change github.tarball_from to 'releases' or 'archive' next update
-github.tarball_from tarball
-revision            11
+github.setup        grpc grpc 1.72.0 v
+github.tarball_from releases
+revision            0
 categories          devel
 maintainers         nomaintainer
 license             Apache-2
@@ -30,19 +30,14 @@
 
 set name_io         ${name}io
 
-patchfiles-append   patch-unbreak-port_platform.diff
-patchfiles-append   patch-python-respect-cc-variable.diff
+patchfiles-append   patch-use-cxx17.diff
 patchfiles-append   patch-avoid-overlinking-abseil.diff
 
-patchfiles-append   patch-src-core-ext-xds-xds_api.cc.diff
-
 # abseil and re2 require c++17 support
 compiler.cxx_standard  2017
 
 # https://github.com/grpc/grpc/commit/f15ba1ffc73c5d0b63754df72fc47c567b9c7252
-if {[vercmp ${version} >= 1.51.0]} {
 compiler.thread_local_storage yes
-}
 
 depends_build-append \
                     path:bin/pkg-config:pkgconfig
@@ -52,8 +47,7 @@
                     port:c-ares \
                     port:lbzip2 \
                     path:lib/pkgconfig/libuv.pc:libuv \
-                    path:lib/libssl.dylib:openssl \
-                    port:protobuf3-cpp \
+                    port:protobuf \
                     port:re2 \
                     port:zlib
 
@@ -87,7 +81,9 @@
                     -DgRPC_PROTOBUF_PROVIDER=package \
                     -DgRPC_RE2_PROVIDER=package \
                     -DgRPC_SSL_PROVIDER=package \
-                    -DgRPC_ZLIB_PROVIDER=package
+                    -DgRPC_ZLIB_PROVIDER=package \
+                    -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-undefined,dynamic_lookup" \
+                    -DCMAKE_EXE_LINKER_FLAGS="-Wl,-undefined,dynamic_lookup,-rpath,${prefix}/lib,-rpath,${prefix}/lib"
 
 # https://github.com/grpc/grpc/pull/32159
 configure.cppflags-append \
@@ -162,7 +158,7 @@
 }
 
 # create Python subports
-set python_versions {39 310}
+set python_versions {39 310 311 312 313}
 
 # Python modules grpcio and grpcio-tools
 foreach v ${python_versions} {
@@ -254,34 +250,42 @@
 if {[string match "py*${name_io}" ${subport}]} {
     depends_build-append \
                     port:py${python.version}-coverage \
-                    port:py${python.version}-cython-compat \
                     port:py${python.version}-setuptools
 
     depends_lib-append \
                     port:py${python.version}-cython \
-                    port:py${python.version}-protobuf3 \
+                    port:py${python.version}-protobuf \
                     port:py${python.version}-six
 
     depends_test-append \
                     port:py${python.version}-twisted
 
-    # Not yet compatible with Cython 3
-    set compat_path [string replace ${python.pkgd} 0 [string length ${python.prefix}]-1 ${prefix}/lib/py${python.version}-cython-compat]
-    build.env-append    PYTHONPATH=${compat_path}
-    destroot.env-append PYTHONPATH=${compat_path}
+    if {${python.version} >= 313} {
+        depends_build-append \
+                        port:py${python.version}-cython
+    } else {
+        depends_build-append \
+                        port:py${python.version}-cython-compat
+        # Not yet compatible with Cython 3
+        set compat_path [string replace ${python.pkgd} 0 [string length ${python.prefix}]-1 ${prefix}/lib/py${python.version}-cython-compat]
+        build.env-append    PYTHONPATH=${compat_path}
+        destroot.env-append PYTHONPATH=${compat_path}
+    }
 }
 
 # Python bindings for grpcio-tools
 if {[string match "py*-${name_io}-tools" ${subport}]} {
-    set grpc_submodules \
-                    protobuf
+    set grpc_submodules [list \
+                    abseil-cpp \
+                    protobuf \
+    ]
 
     depends_build-append \
                     port:py${python.version}-setuptools
 
     depends_lib-append \
                     port:py${python.version}-${name_io} \
-                    port:py${python.version}-protobuf3
+                    port:py${python.version}-protobuf
 
     # Build instructions:
     # https://github.com/grpc/grpc/tree/master/tools/distrib/python/grpcio_tools

diff --git a/devel/grpc/files/patch-avoid-overlinking-abseil.diff b/devel/grpc/files/patch-avoid-overlinking-abseil.diff
@@ -14,13 +14,13 @@ in linking.
 [2]: https://stackoverflow.com/a/61674208
 
 Upstream-Status: Pending
---- ./cmake/pkg-config-template.pc.in.orig	2023-08-26 21:55:00.000000000 +0200
-+++ ./cmake/pkg-config-template.pc.in	2023-08-26 21:59:26.000000000 +0200
-@@ -7,6 +7,6 @@
+--- ./cmake/pkg-config-template.pc.in.orig	2025-05-08 11:14:03
++++ ./cmake/pkg-config-template.pc.in	2025-05-08 11:14:17
+@@ -7,7 +7,6 @@
  Description: @PC_DESCRIPTION@
  Version: @PC_VERSION@
  Cflags: -I${includedir}
 -Requires: @PC_REQUIRES@
-+Requires.private: @PC_REQUIRES@
+ Requires.private: @PC_REQUIRES_PRIVATE@
  Libs: -L${libdir} @PC_LIB@
  Libs.private: @PC_LIBS_PRIVATE@
diff --git a/devel/grpc/files/patch-python-respect-cc-variable.diff b/devel/grpc/files/patch-python-respect-cc-variable.diff
diff --git a/devel/grpc/files/patch-src-core-ext-xds-xds_api.cc.diff b/devel/grpc/files/patch-src-core-ext-xds-xds_api.cc.diff
diff --git a/devel/grpc/files/patch-unbreak-port_platform.diff b/devel/grpc/files/patch-unbreak-port_platform.diff