<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[147845] trunk/dports/sysutils/sysdig</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/147845">147845</a></dd>
<dt>Author</dt> <dd>g5pw@macports.org</dd>
<dt>Date</dt> <dd>2016-04-17 15:15:27 -0700 (Sun, 17 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>sysutils/sysdig: update to 0.9.0
Update patches to avoid using lua headers if any are installed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssysutilssysdigPortfile">trunk/dports/sysutils/sysdig/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssysutilssysdigfilespatchforce_luajit_headersdiff">trunk/dports/sysutils/sysdig/files/patch-force_luajit_headers.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssysutilssysdigfilespatchuserspacelibsinspchiselcppdiff">trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel.cpp.diff</a></li>
<li><a href="#trunkdportssysutilssysdigfilespatchuserspacelibsinspchisel_apicppdiff">trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel_api.cpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssysutilssysdigPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/sysdig/Portfile (147844 => 147845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/sysdig/Portfile 2016-04-17 19:59:03 UTC (rev 147844)
+++ trunk/dports/sysutils/sysdig/Portfile 2016-04-17 22:15:27 UTC (rev 147845)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup cmake 1.0
</span><span class="cx">
</span><del>-github.setup draios sysdig 0.1.89
</del><ins>+github.setup draios sysdig 0.9.0
</ins><span class="cx"> maintainers g5pw openmaintainer
</span><span class="cx"> categories sysutils
</span><span class="cx"> description ${name} is an open source system-level exploration and troubleshooting tool.
</span><span class="lines">@@ -25,30 +25,25 @@
</span><span class="cx"> license GPL-2
</span><span class="cx"> homepage http://www.sysdig.org
</span><span class="cx">
</span><del>-checksums rmd160 44fd872fed9326ce05ae43914f5c48a1b28bc176 \
- sha256 07fe878e733b28aacb7757ba9f75ee0f04a713349974585de20782e572339bee
</del><ins>+checksums rmd160 bbf17f1fecf2e92ff7d376f9af77abc41f32acfb \
+ sha256 6326c3f7c754f96d6f35565736c80f8c7fc72c5f97b61ff9278c8c01c9e3d47f
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:luajit \
</span><span class="cx"> port:zlib \
</span><del>- port:jsoncpp
</del><ins>+ port:jsoncpp \
+ port:ncurses
</ins><span class="cx">
</span><ins>+patchfiles patch-force_luajit_headers.diff
+
</ins><span class="cx"> configure.args-append \
</span><span class="cx"> -DUSE_BUNDLED_LUAJIT=OFF \
</span><span class="cx"> -DUSE_BUNDLED_JSONCPP=OFF \
</span><del>- -DUSE_BUNDLED_ZLIB=OFF
</del><ins>+ -DUSE_BUNDLED_ZLIB=OFF \
+ -DUSE_BUNDLED_NCURSES=OFF
</ins><span class="cx">
</span><span class="cx"> # we are building out-of-source
</span><span class="cx"> post-extract {
</span><span class="cx"> file mkdir ${worksrcpath}/build
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# The patch is necessary to ensure the compiler picks up the .h files from
-# luajit and not lua (see https://github.com/draios/sysdig/issues/203)
-patchfiles patch-userspace-libsinsp-chisel.cpp.diff \
- patch-userspace-libsinsp-chisel_api.cpp.diff
-
-configure.args-append \
- ${worksrcpath}
-configure.dir ${worksrcpath}/build
-
-build.dir ${worksrcpath}/build
</del><ins>+cmake.out_of_source yes
</ins></span></pre></div>
<a id="trunkdportssysutilssysdigfilespatchforce_luajit_headersdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/sysdig/files/patch-force_luajit_headers.diff (0 => 147845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/sysdig/files/patch-force_luajit_headers.diff (rev 0)
+++ trunk/dports/sysutils/sysdig/files/patch-force_luajit_headers.diff 2016-04-17 22:15:27 UTC (rev 147845)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+--- userspace/libsinsp/chisel.cpp 2014-06-25 01:41:11.000000000 +0200
++++ userspace/libsinsp/chisel.cpp 2014-07-08 10:29:01.000000000 +0200
+@@ -44,9 +44,9 @@
+ #ifdef HAS_LUA_CHISELS
+
+ extern "C" {
+-#include "lua.h"
+-#include "lualib.h"
+-#include "lauxlib.h"
++#include <luajit-2.0/lua.h>
++#include <luajit-2.0/lualib.h>
++#include <luajit-2.0/lauxlib.h>
+ }
+ #endif
+
+--- userspace/libsinsp/chisel_api.cpp 2014-09-25 23:45:57.000000000 +0200
++++ userspace/libsinsp/chisel_api.cpp 2014-10-11 15:24:01.000000000 +0200
+@@ -46,9 +46,9 @@
+
+ #ifdef HAS_LUA_CHISELS
+ extern "C" {
+-#include "lua.h"
+-#include "lualib.h"
+-#include "lauxlib.h"
++#include <luajit-2.0/lua.h>
++#include <luajit-2.0/lualib.h>
++#include <luajit-2.0/lauxlib.h>
+ }
+ #endif
+
+--- userspace/libsinsp/lua_parser.cpp
++++ userspace/libsinsp/lua_parser.cpp
+@@ -8,9 +8,9 @@
+
+
+ extern "C" {
+-#include "lua.h"
+-#include "lualib.h"
+-#include "lauxlib.h"
++#include <luajit-2.0/lua.h>
++#include <luajit-2.0/lualib.h>
++#include <luajit-2.0/lauxlib.h>
+ }
+
+ const static struct luaL_reg ll_filter [] =
+--- userspace/libsinsp/lua_parser_api.cpp
++++ userspace/libsinsp/lua_parser_api.cpp
+@@ -3,9 +3,9 @@
+ #include "lua_parser.h"
+
+ extern "C" {
+-#include "lua.h"
+-#include "lualib.h"
+-#include "lauxlib.h"
++#include <luajit-2.0/lua.h>
++#include <luajit-2.0/lualib.h>
++#include <luajit-2.0/lauxlib.h>
+ }
+
+ extern sinsp_filter_check_list g_filterlist;
+--- userspace/libsinsp/lua_parser_api.h
++++ userspace/libsinsp/lua_parser_api.h
+@@ -19,9 +19,9 @@
+ #pragma once
+
+ extern "C" {
+-#include "lua.h"
+-#include "lualib.h"
+-#include "lauxlib.h"
++#include <luajit-2.0/lua.h>
++#include <luajit-2.0/lualib.h>
++#include <luajit-2.0/lauxlib.h>
+ }
+
+ class lua_parser_cbacks
</ins></span></pre></div>
<a id="trunkdportssysutilssysdigfilespatchuserspacelibsinspchiselcppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel.cpp.diff (147844 => 147845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel.cpp.diff 2016-04-17 19:59:03 UTC (rev 147844)
+++ trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel.cpp.diff 2016-04-17 22:15:27 UTC (rev 147845)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>---- userspace/libsinsp/chisel.cpp 2014-06-25 01:41:11.000000000 +0200
-+++ userspace/libsinsp/chisel.cpp 2014-07-08 10:29:01.000000000 +0200
-@@ -39,9 +39,9 @@
-
- #ifdef HAS_LUA_CHISELS
- extern "C" {
--#include "lua.h"
--#include "lualib.h"
--#include "lauxlib.h"
-+#include "luajit-2.0/lua.h"
-+#include "luajit-2.0/lualib.h"
-+#include "luajit-2.0/lauxlib.h"
- }
- #endif
-
</del></span></pre></div>
<a id="trunkdportssysutilssysdigfilespatchuserspacelibsinspchisel_apicppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel_api.cpp.diff (147844 => 147845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel_api.cpp.diff 2016-04-17 19:59:03 UTC (rev 147844)
+++ trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel_api.cpp.diff 2016-04-17 22:15:27 UTC (rev 147845)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>---- userspace/libsinsp/chisel_api.cpp 2014-09-25 23:45:57.000000000 +0200
-+++ userspace/libsinsp/chisel_api.cpp 2014-10-11 15:24:01.000000000 +0200
-@@ -40,9 +40,9 @@
-
- #ifdef HAS_LUA_CHISELS
- extern "C" {
--#include "lua.h"
--#include "lualib.h"
--#include "lauxlib.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lualib.h>
-+#include <luajit-2.0/lauxlib.h>
- }
- #endif
-
</del></span></pre>
</div>
</div>
</body>
</html>