<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/763235585c49b5d75377ee1234af40c5463fb54c">https://github.com/macports/macports-ports/commit/763235585c49b5d75377ee1234af40c5463fb54c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 763235585c49b5d75377ee1234af40c5463fb54c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Nov 16 05:51:46 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> minizip2: Update to 2.9.1
</span>---
archivers/minizip2/Portfile | 8 ++++----
archivers/minizip2/files/DYLD_LIBRARY_PATH.patch | 8 ++++----
archivers/minizip2/files/minizip2.patch | 22 +++++++++++-----------
3 files changed, 19 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/minizip2/Portfile b/archivers/minizip2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d06084f..9a7b5ab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/minizip2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/minizip2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,11 +4,11 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup nmoinvaz minizip 2.9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup nmoinvaz minizip 2.9.1
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 293e3af0bfac8f22b26010c2f4db180842a137f4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7149dafa1f31b2867c3faa2698e4fd88cf9a3c8878462c2ed520cfe541495bb0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 752371
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1b9f54b99d30e2e359dcfb69fe521c46be60818d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2e3db03843dddcf3268081fbaf4ce95caefea38ccdfc2b10178f0166d25c0bab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 744361
</span>
name minizip2
categories archivers
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/minizip2/files/DYLD_LIBRARY_PATH.patch b/archivers/minizip2/files/DYLD_LIBRARY_PATH.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index b3b7b1d..21d7967 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/minizip2/files/DYLD_LIBRARY_PATH.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/minizip2/files/DYLD_LIBRARY_PATH.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> Set DYLD_LIBRARY_PATH so the test runner can find and use the library
that was just built.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2019-05-22 19:50:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2019-06-14 10:49:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -703,30 +704,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-11-15 15:24:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-11-16 05:34:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -770,30 +770,44 @@
</span> COMMAND minizip_cmd ${COMPRESS_METHOD_ARG} -o ${EXTRA_ARGS}
result.zip test.c test.h empty.txt random.bin uniform.bin fuzz
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ that was just built.
</span> endif()
endforeach()
endfunction()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -753,30 +768,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -820,30 +834,40 @@
</span> COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out
fuzz/unzip_fuzzer_seed_corpus/tiny.zip
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/minizip2/files/minizip2.patch b/archivers/minizip2/files/minizip2.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d21f3a5..35d1752 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/minizip2/files/minizip2.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/minizip2/files/minizip2.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,9 +5,9 @@ they are not compatible) and yet upstream does not provide a way to do it.
</span> I hope I've renamed everything I was supposed to rename.
https://github.com/nmoinvaz/minizip/issues/333
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2019-06-14 10:46:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2019-06-14 10:46:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,9 +52,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-11-15 15:24:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-11-16 05:35:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,9 +55,9 @@
</span> set(INSTALL_INC_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR} CACHE PATH "Installation directory for headers")
set(INSTALL_MAN_DIR ${CMAKE_INSTALL_FULL_MANDIR} CACHE PATH "Installation directory for manual pages")
set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,24 +18,24 @@ https://github.com/nmoinvaz/minizip/issues/333
</span> +set(MINIZIP_PC ${CMAKE_CURRENT_BINARY_DIR}/minizip2.pc)
configure_file(minizip.pc.cmakein ${MINIZIP_PC} @ONLY)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check if zlib installation is present
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -589,6 +589,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(STDLIB_DEF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -632,6 +632,7 @@
</span> set_target_properties(${PROJECT_NAME} PROPERTIES
VERSION ${VERSION}
SOVERSION ${SOVERSION}
+ OUTPUT_NAME ${PROJECT_NAME}2
LINKER_LANGUAGE C
<span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFINE_SYMBOL "MZ_EXPORTS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSITION_INDEPENDENT_CODE 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -662,7 +663,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINE_SYMBOL "MZ_EXPORTS")
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- add_executable(minizip_cmd "minizip.c" "test/test.c" "test/test.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -721,7 +722,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(minizip_cmd "minizip.c")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mz_configure_target(minizip_cmd)
</span> - set_target_properties(minizip_cmd PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
+ set_target_properties(minizip_cmd PROPERTIES OUTPUT_NAME ${PROJECT_NAME}2)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions(minizip_cmd PRIVATE ${MINIZIP_DEF})
</span> target_link_libraries(minizip_cmd ${PROJECT_NAME})
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT SKIP_INSTALL_BINARIES AND NOT SKIP_INSTALL_ALL)
</span> --- minizip.c.orig 2019-05-22 19:50:39.000000000 -0500
+++ minizip.c 2019-06-14 10:48:47.000000000 -0500
@@ -64,14 +64,14 @@
</pre><pre style='margin:0'>
</pre>