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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/16c420feca0232775ff57d699d136b5ee4967cb0">https://github.com/macports/macports-ports/commit/16c420feca0232775ff57d699d136b5ee4967cb0</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 16c420f  wireshark2: fix build with +lua when lua5.3 is installed
</span>16c420f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 16c420feca0232775ff57d699d136b5ee4967cb0
</span>Author: ken-cunningham-webuse <ken.cunningham.webuse@gmail.com>
AuthorDate: Thu Nov 8 16:26:31 2018 -0800

<span style='display:block; white-space:pre;color:#404040;'>    wireshark2: fix build with +lua when lua5.3 is installed
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    brings lua 5.2 include directory ahead of system directories
</span><span style='display:block; white-space:pre;color:#404040;'>    so the lua 5.2 lua.h is found as required
</span><span style='display:block; white-space:pre;color:#404040;'>    closes: https://trac.macports.org/ticket/57489
</span>---
 net/wireshark2/Portfile                               |  6 ++++++
 net/wireshark2/files/patch-wireshark2-luafix-001.diff | 11 +++++++++++
 net/wireshark2/files/patch-wireshark2-luafix-002.diff | 11 +++++++++++
 3 files changed, 28 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark2/Portfile b/net/wireshark2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 12c5511..95e023d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/wireshark2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +62,12 @@ configure.args-append \
</span>                     -DENABLE_ZLIB=OFF \
                     -DBUILD_wireshark=OFF
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix include directory for lua -- stop putting zlib.h include directory first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and then do put lua-52/lua.h directory first in list of include directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fixes the accidental finding of the lua-5.3 lua.h in ${prefix}/include, which fails
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-wireshark2-luafix-001.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-wireshark2-luafix-002.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant qt5 conflicts no_gui description {Build wireshark with a qt5 GUI} {
     PortGroup               qt5 1.0
     configure.args-replace  -DENABLE_APPLICATION_BUNDLE=OFF -DENABLE_APPLICATION_BUNDLE=ON
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark2/files/patch-wireshark2-luafix-001.diff b/net/wireshark2/files/patch-wireshark2-luafix-001.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4a36bc8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark2/files/patch-wireshark2-luafix-001.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;'>+--- CMakeLists.txt.orig    2018-11-08 16:10:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2018-11-08 16:10:20.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1223,7 +1223,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(HAVE_ZLIB 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # Always include the "true" zlib includes first. This works around a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # bug in the Windows setup of GTK[23] which has a faulty zconf.h.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  include_directories(BEFORE ${ZLIB_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  # include_directories(BEFORE ${ZLIB_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(HAVE_LIBLZ4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(HAVE_LZ4 1)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark2/files/patch-wireshark2-luafix-002.diff b/net/wireshark2/files/patch-wireshark2-luafix-002.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8d3eb68
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark2/files/patch-wireshark2-luafix-002.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;'>+--- cmake/modules/FindLUA.cmake.orig       2018-11-08 15:53:04.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/modules/FindLUA.cmake    2018-11-08 15:53:49.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,6 +89,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(LUA_LIBRARY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET( LUA_LIBRARIES "${LUA_LIBRARY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET( LUA_INCLUDE_DIRS ${LUA_INCLUDE_DIR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# put lua_include_dir ahead of other include directories to pick up the right lua.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  include_directories(BEFORE ${LUA_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set ( LUA_DLL_DIR "${LUA_HINTS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       CACHE PATH "Path to Lua DLL"
</span></pre><pre style='margin:0'>

</pre>