From bb7d48c2f9a9fc00b7d0ed7bdbc83edbe856d9f7 Mon Sep 17 00:00:00 2001
From: Suhail Khan <26044674+suhailskhan@users.noreply.github.com>
Date: Sat, 10 May 2025 16:47:00 -0700
Subject: [PATCH 1/4] protobuf-c: update to 1.5.2

---
 devel/protobuf-c/Portfile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/devel/protobuf-c/Portfile b/devel/protobuf-c/Portfile
index 1411b9381e15b..8d3b3921de6b0 100644
--- a/devel/protobuf-c/Portfile
+++ b/devel/protobuf-c/Portfile
@@ -4,14 +4,13 @@ PortSystem      1.0
 PortGroup       compiler_blacklist_versions 1.0
 PortGroup       github 1.0
 
-github.setup    protobuf-c protobuf-c 1.4.1 v
-# Change github.tarball_from to 'releases' or 'archive' next update
-github.tarball_from tarball
-revision        2
+github.setup    protobuf-c protobuf-c 1.5.2 v
+github.tarball_from releases
+revision        0
 
-checksums       sha256  db25f31b88dc8b314c49f3759af505c041658e3efc970cf3f49abaa9f9bc768e \
-                rmd160  a8caaf94112abfefd733ed065a102621347b64f1 \
-                size    134612
+checksums       sha256  e2c86271873a79c92b58fef7ebf8de1aa0df4738347a8bd5d4e65a80a16d0d24 \
+                rmd160  7a24dec822f4753232c09c4367655cefb8d6ade6 \
+                size    532447
 
 categories      devel
 license         BSD
@@ -33,7 +32,7 @@ depends_build-append \
                 port:pkgconfig
 
 depends_lib-append \
-                port:protobuf3-cpp
+                port:protobuf
 
 compiler.cxx_standard 2014
 

From 3452044cebc7545c97f9ee207120ed166a7c4639 Mon Sep 17 00:00:00 2001
From: Suhail Khan <26044674+suhailskhan@users.noreply.github.com>
Date: Sun, 11 May 2025 18:29:38 -0700
Subject: [PATCH 2/4] protobuf-c dependents: revbump

---
 databases/postgis3/Portfile | 2 +-
 gis/mapserver/Portfile      | 2 +-
 gnome/libshumate/Portfile   | 2 +-
 net/kismet/Portfile         | 4 ++--
 net/knot-resolver/Portfile  | 2 +-
 net/knot/Portfile           | 2 +-
 security/yara/Portfile      | 2 +-
 sysutils/netdata/Portfile   | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/databases/postgis3/Portfile b/databases/postgis3/Portfile
index c31ddd6b37280..e2a9079023e19 100644
--- a/databases/postgis3/Portfile
+++ b/databases/postgis3/Portfile
@@ -6,7 +6,7 @@ name                postgis3
 categories          databases gis
 license             GPL-2+
 version             3.5.2
-revision            0
+revision            1
 maintainers         {yahoo.com:n_larsson @nilason} {vince @Veence} openmaintainer
 
 description         PostGIS is the spatial extension to the\
diff --git a/gis/mapserver/Portfile b/gis/mapserver/Portfile
index c5b72129b6a9d..265994b06b4d7 100644
--- a/gis/mapserver/Portfile
+++ b/gis/mapserver/Portfile
@@ -5,7 +5,7 @@ PortGroup           cmake 1.1
 
 name                mapserver
 version             8.0.2
-revision            1
+revision            2
 maintainers         hbaspecto.com:jea {yahoo.com:n_larsson @nilason} openmaintainer
 categories          gis
 license             permissive
diff --git a/gnome/libshumate/Portfile b/gnome/libshumate/Portfile
index d80018947e4e0..bc9172096a00b 100644
--- a/gnome/libshumate/Portfile
+++ b/gnome/libshumate/Portfile
@@ -6,7 +6,7 @@ PortGroup           meson 1.0
 
 name                libshumate
 version             1.2.2
-revision            0
+revision            1
 
 categories          gnome gis x11
 license             LGPL-2.1+
diff --git a/net/kismet/Portfile b/net/kismet/Portfile
index 1994120e269bf..277f71d66b926 100644
--- a/net/kismet/Portfile
+++ b/net/kismet/Portfile
@@ -5,7 +5,7 @@ PortGroup           legacysupport 1.1
 
 name                kismet
 version             2023-07-R1
-revision            0
+revision            1
 checksums           rmd160  c39c4f28b01238718e3e7bdc495808e1a1027dce \
                     sha256  f08548e26ca65fa1e567b1debbea1ca4d0e7206bddb96a4f639c90171873e8f7 \
                     size    11144120
@@ -49,7 +49,7 @@ depends_lib-append \
                     path:lib/libssl.dylib:openssl \
                     port:pcre \
                     port:protobuf-c \
-                    port:protobuf3-cpp
+                    port:protobuf
 
 patchfiles-append   patch-capture_osx_corewlan_wifi-Makefile.diff
 patchfiles-append   binary_function.patch
diff --git a/net/knot-resolver/Portfile b/net/knot-resolver/Portfile
index 69edabd8dc43b..582b4e6ce5b3a 100644
--- a/net/knot-resolver/Portfile
+++ b/net/knot-resolver/Portfile
@@ -9,7 +9,7 @@ legacysupport.newest_darwin_requires_legacy 15
 
 name                knot-resolver
 version             6.0.12
-revision            0
+revision            1
 categories          net
 license             GPL-3+
 maintainers         {mps @Schamschula} openmaintainer
diff --git a/net/knot/Portfile b/net/knot/Portfile
index 1dda093870748..d3584a474aa8a 100644
--- a/net/knot/Portfile
+++ b/net/knot/Portfile
@@ -8,7 +8,7 @@ legacysupport.newest_darwin_requires_legacy 15
 
 name                knot
 version             3.4.6
-revision            0
+revision            1
 categories          net
 license             GPL-3+
 maintainers         {mps @Schamschula} openmaintainer
diff --git a/security/yara/Portfile b/security/yara/Portfile
index d68a5f726fcbf..1bcb143abb852 100644
--- a/security/yara/Portfile
+++ b/security/yara/Portfile
@@ -10,7 +10,7 @@ legacysupport.newest_darwin_requires_legacy 10
 github.setup            VirusTotal yara 4.5.2 v
 # Change github.tarball_from to 'releases' or 'archive' next update
 github.tarball_from     tarball
-revision                0
+revision                1
 
 categories              security
 license                 GPL-2+
diff --git a/sysutils/netdata/Portfile b/sysutils/netdata/Portfile
index beeb03cd12453..1588041eb853c 100644
--- a/sysutils/netdata/Portfile
+++ b/sysutils/netdata/Portfile
@@ -129,7 +129,7 @@ subport ${name}-dashboard {
 
     name                netdata-dashboard
     version             3.0.4
-    revision            0
+    revision            1
 
     description         Static assets for the Netdata Agent dashboard.
     long_description    {*}${description}

From 96a7b866f5e1347ca5b07c5344016e9b97c0a069 Mon Sep 17 00:00:00 2001
From: Suhail Khan <26044674+suhailskhan@users.noreply.github.com>
Date: Fri, 9 May 2025 11:17:10 -0700
Subject: [PATCH 3/4] [temp] protobuf: new port

---
 devel/protobuf/Portfile                      | 125 +++++++++++++++++++
 devel/protobuf/files/cmake-zlib-include.diff |  10 ++
 2 files changed, 135 insertions(+)
 create mode 100644 devel/protobuf/Portfile
 create mode 100644 devel/protobuf/files/cmake-zlib-include.diff

diff --git a/devel/protobuf/Portfile b/devel/protobuf/Portfile
new file mode 100644
index 0000000000000..4d18a4633dd11
--- /dev/null
+++ b/devel/protobuf/Portfile
@@ -0,0 +1,125 @@
+# -*- 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       compiler_blacklist_versions 1.0
+PortGroup       github 1.0
+PortGroup       cmake 1.1
+PortGroup       legacysupport 1.1
+
+# clock_gettime needed for abseil
+# https://github.com/macports/macports-ports/pull/19905#issuecomment-1680281240
+legacysupport.newest_darwin_requires_legacy 15
+
+name            protobuf
+github.setup    protocolbuffers protobuf 30.2 v
+git.branch      v${version}
+revision        0
+
+dist_subdir     ${name}/${version}
+
+categories      devel
+maintainers     nomaintainer
+license         BSD
+
+description     Encode data in an efficient yet extensible format.
+long_description \
+                Google Protocol Buffers are a flexible, efficient, \
+                automated mechanism for serializing structured data -- \
+                think XML, but smaller, faster, and simpler.  You \
+                define how you want your data to be structured once, \
+                then you can use special generated source code to \
+                easily write and read your structured data to and from \
+                a variety of data streams and using a variety of \
+                languages.  You can even update your data structure \
+                without breaking deployed programs that are compiled \
+                against the "old" format.  You specify how you want \
+                the information you're serializing to be structured by \
+                defining protocol buffer message types in .proto \
+                files.  Each protocol buffer message is a small \
+                logical record of information, containing a series of \
+                name-value pairs.
+homepage        https://protobuf.dev
+
+checksums       rmd160  ef4d5bfc28aaec952d4300296016fd0ce8db3e66 \
+                sha256  fb06709acc393cc36f87c251bb28a5500a2e12936d4346099f2c6240f6c7a941 \
+                size    9506934
+
+github.tarball_from releases
+distname        protobuf-${version}
+worksrcdir      protobuf-${version}
+
+# Upstream adds zlib include - which is ${prefix}/include - before search path
+# of 3rd-party components, like gtest, gmock, etc. That causes the external
+# versions of those to be pulled in, and the build fails.
+# So don't let the project cmake add zlib; already added (last) by base.
+patchfiles-append cmake-zlib-include.diff
+
+compiler.cxx_standard   2017
+compiler.thread_local_storage   yes
+# error: constexpr constructor never produces a constant expression [-Winvalid-constexpr]
+compiler.blacklist {clang < 900}
+
+if { [string match *clang* ${configure.compiler}] } {
+    # Quiet deprecation warnings
+    configure.cxxflags-append \
+                -Wno-deprecated-declarations \
+                -Wno-error=unknown-warning-option \
+                -Wno-unknown-warning-option
+}
+
+# Clear optflags; controlled by project, via cmake build type
+configure.optflags
+
+if {[variant_isset debug]} {
+    cmake.build_type Debug
+} else {
+    cmake.build_type RelWithDebInfo
+}
+
+depends_lib-append \
+                port:abseil \
+                port:zlib
+
+configure.args-append \
+                -DBUILD_SHARED_LIBS:BOOL=ON \
+                -Dprotobuf_ABSL_PROVIDER=package \
+                -Dprotobuf_BUILD_LIBPROTOC:BOOL=ON \
+                -Dprotobuf_BUILD_PROTOC_BINARIES:BOOL=ON \
+                -Dprotobuf_BUILD_TESTS:BOOL=OFF
+
+post-destroot {
+    set docdir ${destroot}${prefix}/share/doc/${name}
+
+    xinstall -d -m 755 ${docdir}
+
+    foreach f {CONTRIBUTING.md CONTRIBUTORS.txt LICENSE README.md SECURITY.md editors examples} {
+        file copy ${worksrcpath}/${f} ${docdir}
+    }
+}
+
+proc port_test_ver_check {p_name p_ver p_rev} {
+    if { [catch {set port_ver_info [lindex [registry_active ${p_name}] 0]}] } {
+        error "Tests require that ${p_name} be active; install, then re-run tests"
+    } else {
+        set test_ver ${p_ver}_${p_rev}
+        set port_ver [lindex ${port_ver_info} 1]_[lindex ${port_ver_info} 2]
+        ui_info "port_test_ver_check: ${p_name}: test_ver: ${test_ver}; port_ver: ${port_ver}"
+
+        if { [vercmp ${port_ver} ${test_ver}] != 0 } {
+            error "Tests require installed version of ${p_name} to match port; update, then re-run tests"
+        }
+    }
+}
+
+variant tests description {Build with tests enabled} {
+    pre-configure {
+        port_test_ver_check ${subport} ${version} ${revision}
+    }
+
+    configure.args-replace \
+                -Dprotobuf_BUILD_TESTS:BOOL=OFF \
+                -Dprotobuf_BUILD_TESTS:BOOL=ON
+
+    test.run    yes
+    test.target check
+}
diff --git a/devel/protobuf/files/cmake-zlib-include.diff b/devel/protobuf/files/cmake-zlib-include.diff
new file mode 100644
index 0000000000000..bb5475fc9db75
--- /dev/null
+++ b/devel/protobuf/files/cmake-zlib-include.diff
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2025-05-07 15:35:24
++++ CMakeLists.txt	2025-05-07 15:46:49
+@@ -259,7 +259,6 @@
+ endif (MSVC)
+ 
+ include_directories(
+-  ${ZLIB_INCLUDE_DIRECTORIES}
+   ${protobuf_BINARY_DIR}
+   # Support #include-ing other top-level directories, i.e. upb_generator.
+   ${protobuf_SOURCE_DIR}

From fff501374dc419489d026f42e2f928a5003c2493 Mon Sep 17 00:00:00 2001
From: Suhail Khan <26044674+suhailskhan@users.noreply.github.com>
Date: Fri, 16 May 2025 06:20:28 -0700
Subject: [PATCH 4/4] [temp] ports: set known_fail; cleanup

---
 finance/litecoin/Portfile  |  3 +++
 gis/mapserver/Portfile     |  3 +++
 math/caffe/Portfile        |  3 +++
 math/shogun-devel/Portfile | 16 ++++++++--------
 net/ola/Portfile           |  3 +++
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/finance/litecoin/Portfile b/finance/litecoin/Portfile
index 2925092d6a9c9..a5cc79e7a672e 100644
--- a/finance/litecoin/Portfile
+++ b/finance/litecoin/Portfile
@@ -33,6 +33,9 @@ long_description    Litecoin is a peer-to-peer Internet currency that enables in
 
 license             MIT
 
+# If/when this port is ever fixed, this can be removed                    
+known_fail          yes
+
 homepage            https://litecoin.org
 master_sites        https://download.litecoin.org/litecoin-${version}/src/
 
diff --git a/gis/mapserver/Portfile b/gis/mapserver/Portfile
index 265994b06b4d7..d87ff43b18cc1 100644
--- a/gis/mapserver/Portfile
+++ b/gis/mapserver/Portfile
@@ -14,6 +14,9 @@ description         mapserver
 long_description    MapServer is an Open Source platform for publishing spatial \
                     data and interactive mapping applications to the web.
 
+# If/when this port is ever fixed, this can be removed                    
+known_fail          yes
+
 homepage            https://mapserver.org
 master_sites        https://download.osgeo.org/mapserver
 
diff --git a/math/caffe/Portfile b/math/caffe/Portfile
index 6f54f80af9edf..79121991835cd 100644
--- a/math/caffe/Portfile
+++ b/math/caffe/Portfile
@@ -13,6 +13,9 @@ revision            27
 categories          math science
 maintainers         nomaintainer
 
+# If/when this port is ever fixed, this can be removed
+known_fail          yes
+
 description         a fast framework for deep learning
 long_description    {*}${description}
 
diff --git a/math/shogun-devel/Portfile b/math/shogun-devel/Portfile
index 31aca74448bad..fa038ba255617 100644
--- a/math/shogun-devel/Portfile
+++ b/math/shogun-devel/Portfile
@@ -6,32 +6,32 @@ PortGroup           cmake 1.0
 name                shogun-devel
 version             4.0.0
 set branch          [join [lrange [split ${version} .] 0 1] .]
-revision            23
+revision            24
+
 categories          math science
-platforms           darwin
 license             GPL-3
+maintainers         nomaintainer
 
 conflicts           shogun
 
-maintainers         nomaintainer
+# If/when this port is ever fixed, this can be removed
+known_fail          yes
 
 description         The machine learning toolbox's focus is on large scale \
                     kernel methods
-
 long_description    ${description} and especially on Support Vector Machines \
                     (SVM). It provides a generic SVM object interfacing to \
                     several different SVM implementations, among them the \
                     state of the art OCAS, LibSVM, SVMLight, SVMLin and GPDT.
-
 homepage            http://shogun-toolbox.org
-master_sites        ${homepage}/archives/shogun/releases/${branch}/sources/
 
+master_sites        ${homepage}/archives/shogun/releases/${branch}/sources/
 use_bzip2           yes
-
 distname            shogun-${version}
 
 checksums           rmd160  b6f63baeee7040ada85feb33374010a525384104 \
-                    sha256  ab39d3cc27fc1ddf6128f6e3fc60217e73a843b51c20f5d3ceb69e6565a43695
+                    sha256  ab39d3cc27fc1ddf6128f6e3fc60217e73a843b51c20f5d3ceb69e6565a43695 \
+                    size    4627339
 
 universal_variant   no
 
diff --git a/net/ola/Portfile b/net/ola/Portfile
index fefb45014d3b9..5865a6c529150 100644
--- a/net/ola/Portfile
+++ b/net/ola/Portfile
@@ -19,6 +19,9 @@ long_description    The Open Lighting Architecture (OLA) provides a plugin \
                     which abstract away the underlying DMX over IP protocol \
                     or DMX interface.
 
+# If/when this port is ever fixed, this can be removed                    
+known_fail          yes
+
 homepage            http://www.openlighting.org/ola/
 
 checksums           rmd160  f7435b1386e5ad0962cf7d62138ba95d0cda0058 \