<!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>[135988] trunk/dports/devel/libnifalcon</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/135988">135988</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-05-08 23:40:03 -0700 (Fri, 08 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>libnifalcon: fix build with boost >= 1.50 (#47679); use cmake.out_of_source (#47197)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibnifalconPortfile">trunk/dports/devel/libnifalcon/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/libnifalcon/files/</li>
<li><a href="#trunkdportsdevellibnifalconfilespatchCMakeListstxtdiff">trunk/dports/devel/libnifalcon/files/patch-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsdevellibnifalconfilespatchexamplesCMakeListstxtdiff">trunk/dports/devel/libnifalcon/files/patch-examples-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsdevellibnifalconfilespatchsrcutilCMakeListstxtdiff">trunk/dports/devel/libnifalcon/files/patch-src-util-CMakeLists.txt.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevellibnifalconPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libnifalcon/Portfile (135987 => 135988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libnifalcon/Portfile 2015-05-08 21:27:13 UTC (rev 135987)
+++ trunk/dports/devel/libnifalcon/Portfile 2015-05-09 06:40:03 UTC (rev 135988)
</span><span class="lines">@@ -21,14 +21,13 @@
</span><span class="cx"> sha1 7ab7e2781a9224201da0e461e3fa34d21a8430e0 \
</span><span class="cx"> rmd160 eef75bf1834df6c1a812d0ef19399109e78cdd13
</span><span class="cx">
</span><del>-depends_lib port:boost \
- port:libusb
</del><ins>+# libnifalcon uses the boost static libraries.
+depends_build-append port:boost
</ins><span class="cx">
</span><del>-post-extract {
- file mkdir ${worksrcpath}/build
-}
</del><ins>+depends_lib port:libusb
</ins><span class="cx">
</span><del>-configure.args-append -G \"Unix Makefiles\" ..
</del><ins>+patchfiles patch-CMakeLists.txt.diff \
+ patch-examples-CMakeLists.txt.diff \
+ patch-src-util-CMakeLists.txt.diff
</ins><span class="cx">
</span><del>-configure.dir ${worksrcpath}/build
-build.dir ${worksrcpath}/build
</del><ins>+cmake.out_of_source yes
</ins></span></pre></div>
<a id="trunkdportsdevellibnifalconfilespatchCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libnifalcon/files/patch-CMakeLists.txt.diff (0 => 135988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libnifalcon/files/patch-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/devel/libnifalcon/files/patch-CMakeLists.txt.diff 2015-05-09 06:40:03 UTC (rev 135988)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+https://github.com/qdot/libnifalcon/issues/28
+https://github.com/qdot/libnifalcon/commit/217b724a3316be6b8bc1b82c182f5cff2ff01900
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -70,7 +70,7 @@ IF(NOT Boost_FOUND)
+ MESSAGE(FATAL_ERROR "libnifalcon requires a minimum of the Boost 1.33 headers to build")
+ ENDIF(NOT Boost_FOUND)
+
+-FIND_PACKAGE(Boost COMPONENTS program_options thread)
++FIND_PACKAGE(Boost COMPONENTS program_options thread system)
+
+ ######################################################################################
+ # Project specific globals
</ins></span></pre></div>
<a id="trunkdportsdevellibnifalconfilespatchexamplesCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libnifalcon/files/patch-examples-CMakeLists.txt.diff (0 => 135988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libnifalcon/files/patch-examples-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/devel/libnifalcon/files/patch-examples-CMakeLists.txt.diff 2015-05-09 06:40:03 UTC (rev 135988)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+https://github.com/qdot/libnifalcon/issues/28
+https://github.com/qdot/libnifalcon/commit/f54fba57d432fa3231619c711f5f80bf684c5173
+--- examples/CMakeLists.txt.orig
++++ examples/CMakeLists.txt
+@@ -6,6 +6,7 @@ SET(LIBNIFALCON_EXE_PO_LINK_LIBS
+ ${libnifalcon_cli_base_LIBRARY}
+ ${LIBNIFALCON_EXE_LINK_LIBS}
+ ${Boost_PROGRAM_OPTIONS_LIBRARY}
++ ${Boost_SYSTEM_LIBRARY}
+ )
+
+ ######################################################################################
</ins></span></pre></div>
<a id="trunkdportsdevellibnifalconfilespatchsrcutilCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libnifalcon/files/patch-src-util-CMakeLists.txt.diff (0 => 135988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libnifalcon/files/patch-src-util-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/devel/libnifalcon/files/patch-src-util-CMakeLists.txt.diff 2015-05-09 06:40:03 UTC (rev 135988)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+https://github.com/qdot/libnifalcon/pull/29
+https://github.com/qdot/libnifalcon/commit/7e98c9f2bdf936d236260176921c865f8fd1b108
+--- src/util/CMakeLists.txt.orig
++++ src/util/CMakeLists.txt
+@@ -36,6 +36,11 @@
+ ${Boost_THREAD_LIBRARY}
+ )
+
++ # Boost thread requires system since 1.5x
++ IF(Boost_SYSTEM_FOUND)
++ LIST(APPEND CPP_LINK_LIBS "${Boost_SYSTEM_LIBRARY}")
++ ENDIF()
++
+ SET(SRCS
+ "FalconDeviceBoostThread.cpp"
+ "${LIBNIFALCON_INCLUDE_DIR}/falcon/util/FalconDeviceBoostThread.h"
</ins></span></pre>
</div>
</div>
</body>
</html>