<pre style='margin:0'>
tobypeterson pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/033d2a0aaff2406b1d4aad2cc7a4ac9aac0d9f07">https://github.com/macports/macports-ports/commit/033d2a0aaff2406b1d4aad2cc7a4ac9aac0d9f07</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 033d2a0 unrar: update to 5.5.3, update patches
</span>033d2a0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 033d2a0aaff2406b1d4aad2cc7a4ac9aac0d9f07
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Wed May 17 13:10:13 2017 +0000
<span style='display:block; white-space:pre;color:#404040;'> unrar: update to 5.5.3, update patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/53972
</span>---
archivers/unrar/Portfile | 10 ++---
archivers/unrar/files/patch-dylib.diff | 11 ++---
.../unrar/files/patch-include-consio.hpp.diff | 49 ----------------------
archivers/unrar/files/patch-makefile.unix.diff | 6 +--
4 files changed, 14 insertions(+), 62 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unrar/Portfile b/archivers/unrar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c84f6c1..98e4c93 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/unrar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unrar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name unrar
set my_name ${name}src
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.4.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.5.3
</span> categories archivers
platforms darwin freebsd
maintainers krischik openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,11 +20,10 @@ homepage http://www.rarlab.com/
</span> master_sites ${homepage}rar/
distname ${my_name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 12c656816ca43d6c61c8afea2d561539bd1eda63 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e470c584332422893fb52e049f2cbd99e24dc6c6da971008b4e2ae4284f8796c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 136c9a734a13f03319bb8cf70d1830312241579a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d1d9ef4a9247db088f825666de8f8bb69006d8d8b0e004ff366b3e04c103a2b3
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-makefile.unix.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-include-consio.hpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-makefile.unix.diff
</span>
worksrcdir ${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,6 +94,7 @@ subport libunrar {
</span> xinstall -m 644 ${worksrcpath}/dll.hpp ${destroot}${prefix}/include/unrar
if {${os.platform} eq "darwin"} {
xinstall ${worksrcpath}/libunrar.dylib ${destroot}${prefix}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall ${worksrcpath}/libunrar.a ${destroot}${prefix}/lib
</span> } else {
xinstall ${worksrcpath}/libunrar.so ${destroot}${prefix}/lib
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unrar/files/patch-dylib.diff b/archivers/unrar/files/patch-dylib.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dca3d2e..1314054 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/unrar/files/patch-dylib.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unrar/files/patch-dylib.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- makefile.orig 2012-05-15 00:31:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2012-11-04 02:54:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -132,8 +132,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.orig 2017-01-18 11:47:58.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2017-05-17 07:21:45.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,9 +144,9 @@
</span> lib: WHAT=RARDLL
lib: CXXFLAGS+=$(LIBFLAGS)
lib: clean $(OBJECTS) $(LIB_OBJ)
- @rm -f libunrar.so
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
</span> + @rm -f libunrar.dylib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ @rm -f libunrar.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
</span> + $(LINK) -dynamiclib -o libunrar.dylib -install_name $(DESTDIR)/lib/libunrar.dylib $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)
</span>
install-unrar:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- install -D unrar $(DESTDIR)/bin/unrar
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unrar/files/patch-include-consio.hpp.diff b/archivers/unrar/files/patch-include-consio.hpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1917242..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/unrar/files/patch-include-consio.hpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,49 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- consio.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ consio.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rar.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "log.cpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "consio.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static MESSAGE_TYPE MsgStream=MSG_STDOUT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static RAR_CHARSET RedirectCharset=RCH_DEFAULT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- list.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ list.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rar.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "consio.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void ListFileHeader(Archive &Arc,FileHeader &hd,bool &TitleShown,bool Verbose,bool Technical,bool Bare);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void ListSymLink(Archive &Arc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- volume.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ volume.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rar.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "consio.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef RARDLL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static bool DllVolChange(RAROptions *Cmd,wchar *NextName,size_t NameSize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmddata.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmddata.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rar.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "consio.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CommandData::CommandData()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- recvol3.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ recvol3.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rar.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "consio.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Buffer size for all volumes involved.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const size_t TotalBufferSize=0x4000000;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- recvol5.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ recvol5.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rar.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "consio.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const uint MaxVolumes=65535;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unrar/files/patch-makefile.unix.diff b/archivers/unrar/files/patch-makefile.unix.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a301b9d..f0813ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/unrar/files/patch-makefile.unix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unrar/files/patch-makefile.unix.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;'>---- makefile.orig 2012-05-15 00:31:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 02:52:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,7 +98,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.orig 2017-01-18 11:47:58.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2017-05-17 07:21:45.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,7 +110,7 @@
</span> WHAT=UNRAR
UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o qopen.o
</pre><pre style='margin:0'>
</pre>