<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/42543c601942ad4de293bcbd706f7df9c6671333">https://github.com/macports/macports-ports/commit/42543c601942ad4de293bcbd706f7df9c6671333</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 42543c601942ad4de293bcbd706f7df9c6671333
</span>Author: Vadym-Valdis Yudaiev <judaew@macports.org>
AuthorDate: Sat Sep 24 15:54:51 2022 +0300
<span style='display:block; white-space:pre;color:#404040;'> lzma: update to 22.01
</span>---
archivers/lzma/Portfile | 51 +++++++++++++++++-----------
archivers/lzma/files/patch-7zip_gcc_mak.diff | 11 ++++++
archivers/lzma/files/patch-makefile.gcc | 11 ------
3 files changed, 42 insertions(+), 31 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/lzma/Portfile b/archivers/lzma/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 438e215b660..d56b587c4f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/lzma/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/lzma/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name lzma
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.65
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 22.01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories archivers
license public-domain
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,45 +17,56 @@ long_description \
</span> format in 7-Zip program. LZMA provides high compression \
ratio and very fast decompression.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.7-zip.org/sdk.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/sevenzip/LZMA%20SDK/${version}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.7-zip.org/sdk.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://www.7-zip.org//a/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_7z yes
</span> distname lzma[strsed ${version} {/\.//}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 70953d4ee8542addf566953e0ed62e9c75a016b5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 288122
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 beb1e2c42719e4156935dc573df018146406e353 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 35b1689169efbc7c3c147387e5495130f371b4bad8ec24f049d28e126d52d9fe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1261282
</span>
extract.mkdir yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Convert DOS to UNIX line endings so we can patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\r||g" ${worksrcpath}/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-lzma.1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-makefile.gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-7zip_gcc_mak.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-lzma.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@CC@|${configure.cc} ${configure.cflags} [get_canonical_archflags cc]|g" ${worksrcpath}/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@CXX@|${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx]|g" ${worksrcpath}/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|#include <sys/sysmacros.h>|//#include <sys/sysmacros.h>|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/CPP/7zip/Common/FileStreams.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/CPP/7zip/UI/Common/UpdateCallback.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # needed for legacysupport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|LDFLAGS = $\(\LDFLAGS_STATIC\)\|LDFLAGS += $\(\LDFLAGS_STATIC\)\|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/C/7zip_gcc_c.mak \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/CPP/7zip/7zip_gcc.mak
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ld: warning: option -s is obsolete and being ignored
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # atom not found in symbolIndex on 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|LFLAGS_ALL = -s|LFLAGS_ALL =|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/C/7zip_gcc_c.mak \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/CPP/7zip/7zip_gcc.mak
</span> }
use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir ${worksrcpath}/CPP/7zip/Compress/LZMA_Alone
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.dir ${worksrcpath}/CPP/7zip/Bundles/LzmaCon
</span> build.type gnu
build.args -f makefile.gcc
installs_libs no
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -s ${worksrcpath}/CPP/7zip/Compress/LZMA_Alone/lzma ${destroot}${prefix}/bin/lzma_alone
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${worksrcpath}/lzma.1 ${destroot}${prefix}/share/man/man1/lzma_alone.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall ${worksrcpath}/CPP/7zip/Bundles/LzmaCon/_o/lzma \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/lzma_alone
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall ${worksrcpath}/lzma.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/man/man1/lzma_alone.1
</span>
set docdir ${prefix}/share/doc/${name}/
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} history.txt lzma.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath}/DOC \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lzma.txt lzma-history.txt lzma-specification.txt \
</span> ${destroot}${docdir}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/lzma/files/patch-7zip_gcc_mak.diff b/archivers/lzma/files/patch-7zip_gcc_mak.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5917f49eeda
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/lzma/files/patch-7zip_gcc_mak.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CPP/7zip/7zip_gcc.mak.orig 2022-04-02 21:21:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CPP/7zip/7zip_gcc.mak 2022-04-02 21:21:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(CC), xlc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS_WARN_WALL = -Wall -Werror -Wextra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS_WARN_WALL = -Wall -Wextra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for object file
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/lzma/files/patch-makefile.gcc b/archivers/lzma/files/patch-makefile.gcc
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bb81fe3a875..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/lzma/files/patch-makefile.gcc
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CPP/7zip/Compress/LZMA_Alone/makefile.gcc.orig 2018-05-31 22:49:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CPP/7zip/Compress/LZMA_Alone/makefile.gcc 2018-05-31 22:52:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PROG = lzma
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CXX = g++ -O2 -Wall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CXX_C = gcc -O2 -Wall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXX = @CXX@ -Wall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXX_C = @CC@ -Wall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB = -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RM = rm -f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = -c
</span></pre><pre style='margin:0'>
</pre>