<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/56005de486d09c5472933e7d00b8c220235375c0">https://github.com/macports/macports-ports/commit/56005de486d09c5472933e7d00b8c220235375c0</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 56005de  libzip: Fix include path order
</span>56005de is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 56005de486d09c5472933e7d00b8c220235375c0
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Apr 9 09:25:14 2018 -0500

<span style='display:block; white-space:pre;color:#404040;'>    libzip: Fix include path order
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes build failure when upgrading from older version.
</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/56246
</span>---
 archivers/libzip/Portfile                  |  2 ++
 archivers/libzip/files/include-order.patch | 43 ++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/libzip/Portfile b/archivers/libzip/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e25339..ec346eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/libzip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/libzip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +27,8 @@ depends_build-append \
</span> depends_lib-append  port:bzip2 \
                     port:zlib
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          include-order.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
                     -DENABLE_COMMONCRYPTO:Bool=OFF \
                     -DENABLE_GNUTLS:Bool=OFF \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/libzip/files/include-order.patch b/archivers/libzip/files/include-order.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d28d83c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/libzip/files/include-order.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Search libzip source path before other include paths.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/nih-at/libzip/commit/4cd3c601cb48be89cd9e6e5082cc7bbe47e8a003
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,7 +179,7 @@ ELSE(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/..)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/..)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_CUSTOM_TARGET(update_zip_err_str
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/make_zip_err_str.sh ${CMAKE_CURRENT_SOURCE_DIR}/zip.h ${CMAKE_CURRENT_SOURCE_DIR}/zip_err_str.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- regress/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ regress/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,8 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_FUNCTION_EXISTS(getopt HAVE_GETOPT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(NOT HAVE_GETOPT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET(SRC_EXTRA_FILES ../src/getopt.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  ${CMAKE_CURRENT_SOURCE_DIR}/../src)
</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;'>+ SET(TEST_PROGRAMS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,8 +201,6 @@ FOREACH(CASE ${EXTRA_TESTS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET_TESTS_PROPERTIES(${CASE} PROPERTIES SKIP_RETURN_CODE 77)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDFOREACH()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  ${CMAKE_CURRENT_SOURCE_DIR}/../src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  ${CMAKE_CURRENT_BINARY_DIR}/..)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../lib ${CMAKE_CURRENT_SOURCE_DIR}/../src ${CMAKE_CURRENT_BINARY_DIR}/..)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  ${CMAKE_CURRENT_BINARY_DIR}/..)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../lib ${CMAKE_CURRENT_BINARY_DIR}/..)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_FUNCTION_EXISTS(getopt HAVE_GETOPT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(NOT HAVE_GETOPT)
</span></pre><pre style='margin:0'>

</pre>