protobuf ports: take ownership; cleanup

chris-nielsen-wgu · chris-nielsen-wgu · commit 7e1f2b02077d · 2025-05-07T14:19:42.000-04:00
diff --git a/devel/protobuf-cpp/Portfile b/devel/protobuf-cpp/Portfile
@@ -1,9 +1,9 @@
 # -*- 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       cmake 1.1
 PortGroup       legacysupport 1.1
 
 # clock_gettime needed for abseil
@@ -15,14 +15,13 @@ set release_version \
 
 name            protobuf-cpp
 github.setup    protocolbuffers protobuf 5.${release_version} v
+github.tarball_from releases
 git.branch      v${release_version}
 revision        0
 
-dist_subdir     ${name}/${version}
-
 categories      devel
-maintainers     nomaintainer
 license         BSD
+maintainers     {mascguy @mascguy} openmaintainer
 
 description     Encode data in an efficient yet extensible format.
 long_description \
@@ -43,14 +42,13 @@ long_description \
                 name-value pairs.
 homepage        https://protobuf.dev
 
+distname        protobuf-${release_version}
+worksrcdir      protobuf-${release_version}
+
 checksums       rmd160  3a8a4c815f22f23c5d8363d5fd7972b005d971a9 \
                 sha256  6bd9dcc91b17ef25c26adf86db71c67ec02431dc92e9589eaf82e22889230496 \
                 size    9350942
 
-github.tarball_from releases
-distname        protobuf-${release_version}
-worksrcdir      protobuf-${release_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.
@@ -64,7 +62,8 @@ patchfiles-append patch-unbreak-time.diff
 compiler.cxx_standard   2017
 compiler.thread_local_storage   yes
 # error: constexpr constructor never produces a constant expression [-Winvalid-constexpr]
-compiler.blacklist {clang < 900}
+compiler.blacklist-append \
+                {clang < 900}
 
 if { [string match *clang* ${configure.compiler}] } {
     # Quiet deprecation warnings
@@ -97,10 +96,10 @@ configure.args-append \
 post-destroot {
     set docdir ${destroot}${prefix}/share/doc/${name}
 
-    xinstall -d -m 755 ${docdir}
+    xinstall -d ${docdir}
 
     foreach f {CONTRIBUTING.md CONTRIBUTORS.txt LICENSE README.md SECURITY.md editors examples} {
-        file copy ${worksrcpath}/${f} ${docdir}
+        copy ${worksrcpath}/${f} ${docdir}
     }
 }
 
diff --git a/devel/protobuf-java/Portfile b/devel/protobuf-java/Portfile
@@ -1,15 +1,23 @@
+# -*- 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	github 1.0
+PortGroup       github 1.0
 
 name            protobuf-java
 version         2.6.1
 revision        1
+github.setup    google protobuf ${version} v
+github.tarball_from releases
+
+conflicts       protobuf3-java
+platforms       any
+supported_archs noarch
+
 categories      devel
-maintainers     nomaintainer
 license         BSD
-description     Encode data in an efficient yet extensible format.
-conflicts       protobuf3-java
+maintainers     {mascguy @mascguy} openmaintainer
 
+description     Encode data in an efficient yet extensible format.
 long_description \
                 Google Protocol Buffers are a flexible, efficient, \
                 automated mechanism for serializing structured data -- \
@@ -26,27 +34,27 @@ long_description \
                 files.  Each protocol buffer message is a small \
                 logical record of information, containing a series of \
                 name-value pairs.
-
-github.setup    google protobuf ${version} v
-github.tarball_from releases
 homepage        https://github.com/google/protobuf
+
 master_sites    https://github.com/google/protobuf/releases/download/v${version}
 distfiles       protobuf-${version}.tar.bz2
 dist_subdir     protobuf-cpp
 worksrcdir      protobuf-${version}/java
-
 use_bzip2       yes
-checksums       sha1   6421ee86d8fb4e39f21f56991daa892a3e8d314b \
-                sha256 ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910
 
-platforms       any
-supported_archs noarch
+checksums       rmd160  654acfce84b4ba738a0332d0c967d1399ff6e4c2 \
+                sha256  ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910 \
+                size    2021416
+
+depends_build-append \
+                port:apache-ant
 
-depends_lib     port:zlib port:protobuf2-cpp
-depends_build   port:apache-ant
+depends_lib-append \
+                port:protobuf2-cpp \
+                port:zlib
 
-patch {
-    file copy ${filespath}/build.xml ${worksrcpath}/
+post-patch {
+    copy ${filespath}/build.xml ${worksrcpath}/
 }
 
 use_configure   no
@@ -59,9 +67,9 @@ destroot {
     set javadir ${destroot}${prefix}/share/java
     set docdir ${destroot}${prefix}/share/doc/${name}
 
-    xinstall -d -m 755 ${javadir}
-    xinstall -d -m 755 ${docdir}
+    xinstall -d ${javadir}
+    xinstall -d ${docdir}
 
-    file copy ${worksrcpath}/protobuf.jar ${javadir}
-    file copy ${worksrcpath}/api ${docdir}/api
+    copy ${worksrcpath}/protobuf.jar ${javadir}
+    copy ${worksrcpath}/api ${docdir}/api
 }
diff --git a/devel/protobuf2-cpp/Portfile b/devel/protobuf2-cpp/Portfile
@@ -1,16 +1,19 @@
 # -*- 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  github 1.0
+PortSystem      1.0
+PortGroup       github 1.0
 
 name            protobuf2-cpp
 version         2.6.1
 revision        1
+github.setup    google protobuf ${version} v
+github.tarball_from releases
+
 categories      devel
-maintainers     nomaintainer
 license         BSD
-description     Encode data in an efficient yet extensible format.
+maintainers     {mascguy @mascguy} openmaintainer
 
+description     Encode data in an efficient yet extensible format.
 long_description \
                 Google Protocol Buffers are a flexible, efficient, \
                 automated mechanism for serializing structured data -- \
@@ -27,23 +30,19 @@ long_description \
                 files.  Each protocol buffer message is a small \
                 logical record of information, containing a series of \
                 name-value pairs.
+homepage        https://github.com/google/protobuf
 
-github.setup    google protobuf ${version} v
-github.tarball_from releases
 distname        protobuf-${version}
 dist_subdir     protobuf-cpp
-homepage        https://github.com/google/protobuf
-master_sites    https://github.com/google/protobuf/releases/download/v${version}
-distfiles       protobuf-${version}.tar.bz2
 worksrcdir      protobuf-${version}
-
 use_bzip2       yes
-checksums       sha1   6421ee86d8fb4e39f21f56991daa892a3e8d314b \
-                sha256 ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910
 
-platforms       darwin
+checksums       rmd160  654acfce84b4ba738a0332d0c967d1399ff6e4c2 \
+                sha256  ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910 \
+                size    2021416
 
-depends_lib     port:zlib
+depends_lib-append \
+                port:zlib
 
 # 2.6.1's glibtool doesn't pass -stdlib=libc++ to the linker
 use_autoreconf  yes
@@ -56,10 +55,10 @@ configure.args-append       --prefix=${prefix}/libexec/${name}
 post-destroot {
     set docdir ${destroot}${prefix}/share/doc/${name}
 
-    xinstall -d -m 755 ${docdir}
+    xinstall -d ${docdir}
 
     foreach f {CHANGES.txt CONTRIBUTORS.txt INSTALL.txt LICENSE README.md editors examples} {
-        file copy ${worksrcpath}/${f} ${docdir}
+        copy ${worksrcpath}/${f} ${docdir}
     }
 }
 
diff --git a/devel/protobuf3-cpp/Portfile b/devel/protobuf3-cpp/Portfile
@@ -1,9 +1,9 @@
 # -*- 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       cmake 1.1
 
 # NOTE: For any version number change, also
 # NOTE:   Update py-protobuf3 version's number to match
@@ -13,13 +13,15 @@ set release_version \
                 21.12
 
 name            protobuf3-cpp
-github.setup    protocolbuffers protobuf 3.${release_version} v
-git.branch      v${release_version}
+version         3.${release_version}
 revision        3
+github.setup    protocolbuffers protobuf ${version} v
+github.tarball_from releases
+git.branch      v${release_version}
 
 categories      devel
-maintainers     {mascguy @mascguy} openmaintainer
 license         BSD
+maintainers     {mascguy @mascguy} openmaintainer
 
 description     Encode data in an efficient yet extensible format.
 long_description \
@@ -44,7 +46,6 @@ checksums       rmd160  f7c2879e427160c2a5055a2ab5d5ab231304fd31 \
                 sha256  4eab9b524aa5913c6fffb20b2a8abf5ef7f95a80bc0701f3a6dbb4c607f73460 \
                 size    4842303
 
-github.tarball_from releases
 distname        protobuf-cpp-${version}
 dist_subdir     protobuf-cpp
 worksrcdir      protobuf-${version}
@@ -58,7 +59,8 @@ patchfiles-append cmake-zlib-include.diff
 compiler.cxx_standard   2011
 compiler.thread_local_storage   yes
 # error: constexpr constructor never produces a constant expression [-Winvalid-constexpr]
-compiler.blacklist {clang < 900}
+compiler.blacklist-append \
+                {clang < 900}
 
 if { [string match *clang* ${configure.compiler}] } {
     # Quiet deprecation warnings
@@ -91,10 +93,10 @@ configure.args-append \
 post-destroot {
     set docdir ${destroot}${prefix}/share/doc/${name}
 
-    xinstall -d -m 755 ${docdir}
+    xinstall -d ${docdir}
 
     foreach f {CHANGES.txt CONTRIBUTORS.txt LICENSE README.md editors examples} {
-        file copy ${worksrcpath}/${f} ${docdir}
+        copy ${worksrcpath}/${f} ${docdir}
     }
 }
 
diff --git a/devel/protobuf3-cpp/files/cmake-zlib-include.diff b/devel/protobuf3-cpp/files/cmake-zlib-include.diff
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig	2023-06-01 13:13:50.000000000 -0400
-+++ CMakeLists.txt	2023-06-01 13:14:05.000000000 -0400
+--- CMakeLists.txt.orig	2025-05-06 12:13:56.211941690 -0400
++++ CMakeLists.txt	2025-05-06 12:14:10.546404659 -0400
 @@ -296,7 +296,6 @@
  endif (MSVC)
  
diff --git a/devel/protobuf5-cpp/Portfile b/devel/protobuf5-cpp/Portfile
@@ -1,9 +1,9 @@
 # -*- 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       cmake 1.1
 PortGroup       legacysupport 1.1
 
 # clock_gettime needed for abseil
@@ -63,8 +63,10 @@ patchfiles-append patch-unbreak-time.diff
 
 compiler.cxx_standard   2017
 compiler.thread_local_storage   yes
+
 # error: constexpr constructor never produces a constant expression [-Winvalid-constexpr]
-compiler.blacklist {clang < 900}
+compiler.blacklist-append \
+                {clang < 900}
 
 if { [string match *clang* ${configure.compiler}] } {
     # Quiet deprecation warnings
@@ -100,10 +102,10 @@ configure.args-append \
 post-destroot {
     set docdir ${destroot}${prefix}/share/doc/${name}
 
-    xinstall -d -m 755 ${docdir}
+    xinstall -d ${docdir}
 
     foreach f {CONTRIBUTING.md CONTRIBUTORS.txt LICENSE README.md SECURITY.md editors examples} {
-        file copy ${worksrcpath}/${f} ${docdir}
+        copy ${worksrcpath}/${f} ${docdir}
     }
 }
 
@@ -134,5 +136,4 @@ variant tests description {Build with tests enabled} {
     test.target check
 }
 
-livecheck.version       ${release_version}
-github.livecheck.regex  {(2[6-9]\.[0-9]+)}
+livecheck.version ${release_version}
diff --git a/python/py-protobuf/Portfile b/python/py-protobuf/Portfile
