<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/31f268fe14ee039005e8cabbef9eef4671d73c0a">https://github.com/macports/macports-ports/commit/31f268fe14ee039005e8cabbef9eef4671d73c0a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 31f268fe14ee039005e8cabbef9eef4671d73c0a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Dec 22 04:01:33 2021 -0600

<span style='display:block; white-space:pre;color:#404040;'>    zstd: Update to 1.5.0; use portgroups
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Use makefile portgroup to reduce code duplication.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Use muniversal portgroup to fix universal build when old gcc is used.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/64261
</span>---
 archivers/zstd/Portfile                            | 46 +++++++---------------
 archivers/zstd/files/flags.patch                   | 24 +++++++++++
 .../zstd/files/patch-zstd-tiger-no-backtrace.diff  |  6 +--
 3 files changed, 41 insertions(+), 35 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zstd/Portfile b/archivers/zstd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 16ea7519abf..c3144594310 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zstd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zstd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,18 +3,14 @@
</span> PortSystem          1.0
 PortGroup           github 1.0
 PortGroup           clang_dependency 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           makefile 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           muniversal 1.0
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        facebook zstd 1.5.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        facebook zstd 1.5.1 v
</span> revision            0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  0edbe1beaf89e9b565daa75cf96e3a8428064af3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    1851389
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${version} eq "1.5.0"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        incr revision
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  4eff742b0aa0007b38b9117440e61c0d4c4c3116 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  e28b2f2ed5710ea0d3a1ecac3f6a947a016b972b9dd30242369010e5f53d7002 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    1934669
</span> 
 categories          archivers devel
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,33 +33,19 @@ depends_lib-append  port:lz4 \
</span> # linked by CLI tools in ${prefix}/bin only.
 license_noconflict  lz4 xz zlib
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-zstd-tiger-no-backtrace.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace -W ${worksrcpath} "s/-Wvla //g" lib/Makefile programs/Makefile tests/Makefile tests/fuzz/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure       no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-zstd-tiger-no-backtrace.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    flags.patch
</span> 
 platform darwin 8 {
     depends_build-append port:gmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.cmd    gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.cmd       ${prefix}/bin/gmake
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target        allmost
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.post_args     V=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix upgrade from previous version because -I flags are in the wrong order.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append    CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target        allmost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args          V=1
</span> 
 test.run            yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.env-append     {*}${build.env}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append {*}${build.env}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.args           {*}${build.args}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zstd/files/flags.patch b/archivers/zstd/files/flags.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1452c4a8ee1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zstd/files/flags.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Remove flags that old compilers don't understand.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/macports/macports-ports/pull/568
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/educational_decoder/Makefile.orig  2021-12-20 16:49:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/educational_decoder/Makefile       2021-12-22 03:35:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS   += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow                 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             -Wstrict-aliasing=1 -Wswitch-enum                               \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             -Wredundant-decls -Wstrict-prototypes -Wundef                   \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings      \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings            \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             -std=c99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS   += $(DEBUGFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS   += $(MOREFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/libzstd.mk.orig    2021-12-20 16:49:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/libzstd.mk 2021-12-22 02:41:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,7 +90,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             -Wstrict-prototypes -Wundef -Wpointer-arith \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             -Wredundant-decls -Wmissing-prototypes -Wc++-compat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS   += $(DEBUGFLAGS) $(MOREFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS  += $(MOREFLAGS)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zstd/files/patch-zstd-tiger-no-backtrace.diff b/archivers/zstd/files/patch-zstd-tiger-no-backtrace.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 463c177ac3f..f227aee5c9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zstd/files/patch-zstd-tiger-no-backtrace.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zstd/files/patch-zstd-tiger-no-backtrace.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- programs/fileio.c.orig 2019-07-19 11:37:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ programs/fileio.c      2019-07-24 10:08:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,7 +176,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- programs/fileio.c.orig 2021-12-20 16:49:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ programs/fileio.c      2021-12-22 02:31:01.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,7 +186,7 @@
</span>  #if !defined(BACKTRACE_ENABLE)
  /* automatic detector : backtrace enabled by default on linux+glibc and osx */
  #  if (defined(__linux__) && (defined(__GLIBC__) && !defined(__UCLIBC__))) \
</pre><pre style='margin:0'>

</pre>