<!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>[142470] trunk/dports/science/volk-gnss-sdr</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/142470">142470</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-11-12 09:23:31 -0800 (Thu, 12 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>volk-gnss-sdr*:
+ update devel to 8838e906 and next to 8abe0486, both 20151103;
+ add temporary patches for all subports to fix name of cmake config file;
+ add configure.args to specify where to install cmake files;
+ rename release patchfile for clarity;
+ rev-bump release for changes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencevolkgnsssdrPortfile">trunk/dports/science/volk-gnss-sdr/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencevolkgnsssdrfilespatchVolk_GnssSdrConfigcmakedeveldiff">trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.devel.diff</a></li>
<li><a href="#trunkdportssciencevolkgnsssdrfilespatchVolk_GnssSdrConfigcmakenextdiff">trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.next.diff</a></li>
<li><a href="#trunkdportssciencevolkgnsssdrfilespatchVolk_GnssSdrConfigcmakereleasediff">trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.release.diff</a></li>
<li><a href="#trunkdportssciencevolkgnsssdrfilespatchvolkincludereleasediff">trunk/dports/science/volk-gnss-sdr/files/patch-volk-include.release.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencevolkgnsssdrfilespatchvolkdiff">trunk/dports/science/volk-gnss-sdr/files/patch-volk.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencevolkgnsssdrPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/volk-gnss-sdr/Portfile (142469 => 142470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/volk-gnss-sdr/Portfile 2015-11-12 16:41:55 UTC (rev 142469)
+++ trunk/dports/science/volk-gnss-sdr/Portfile 2015-11-12 17:23:31 UTC (rev 142470)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> This port is kept up with the VOLK-GNSS-SDR release, which is typically updated every few months. This version compiles against the gnss-sdr and gnuradio ports.
</span><span class="cx">
</span><span class="cx"> github.setup gnss-sdr gnss-sdr 0.0.6 v
</span><del>- revision 1
</del><ins>+ revision 2
</ins><span class="cx"> checksums rmd160 3a578f4795f6230d3f627dbe6f80f77c7dac206e \
</span><span class="cx"> sha256 ed81a5dff8d91b0b1d561ab8a240818da447c8358b95ab42d6a17b479e873c3e
</span><span class="cx"> github.tarball_from tags
</span><span class="lines">@@ -31,8 +31,12 @@
</span><span class="cx">
</span><span class="cx"> # temporary patch to fix Volk #define in compatibility
</span><span class="cx">
</span><del>- patchfiles-append patch-volk.diff
</del><ins>+ patchfiles-append patch-volk-include.release.diff
</ins><span class="cx">
</span><ins>+ # temporary patch to fix name of Volk-Gnss-Sdr cmake file
+
+ patchfiles-append patch-Volk_GnssSdrConfig.cmake.release.diff
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport volk-gnss-sdr-devel {
</span><span class="lines">@@ -41,14 +45,17 @@
</span><span class="cx"> This port is kept up with the VOLK-GNSS-SDR GIT master branch, which is typically updated daily to weekly. This version of VOLK-GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnss-sdr-devel and gnuradio-devel ports. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnss-sdr and gnuradio ports, cleaning any current builds, and trying again.
</span><span class="cx">
</span><span class="cx"> name volk-gnss-sdr-devel
</span><del>- github.setup gnss-sdr gnss-sdr df6bd17bd844cddf46ce3f7e2a86fcde4a5eb24b
- version 20151025
- revision 1
- checksums rmd160 022cdccaf466d7c5cd43e4fd0ba201400eda9d0e \
- sha256 0808ecf6e17bf8e2b52f19bfd0c472f18c5a8718d5a665574c052c0a06452789
</del><ins>+ github.setup gnss-sdr gnss-sdr 8838e9063e7479c1c6339e0d012724d269e8d000
+ version 20151103
+ checksums rmd160 fc6e6a176c97dc1a0a3072e28accb37b0d301999 \
+ sha256 42337ac6a79f0bee33fbc8f5eb4ab586346050ae9873046a4b6e415bce0eb20e
</ins><span class="cx">
</span><span class="cx"> conflicts volk-gnss-sdr volk-gnss-sdr-next
</span><span class="cx">
</span><ins>+ # temporary patch to fix name of Volk-Gnss-Sdr cmake file
+
+ patchfiles-append patch-Volk_GnssSdrConfig.cmake.devel.diff
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport volk-gnss-sdr-next {
</span><span class="lines">@@ -56,14 +63,17 @@
</span><span class="cx"> This port is kept up with the VOLK-GNSS-SDR GIT next branch, which is typically updated daily to weekly. This version of VOLK-GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnss-sdr-next and gnuradio-next ports. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnss-sdr and gnuradio ports, cleaning any current builds, and trying again.
</span><span class="cx">
</span><span class="cx"> name volk-gnss-sdr-next
</span><del>- github.setup gnss-sdr gnss-sdr db4d55db6227cb220499ef1431f79cfbbf48b469
- version 20151101
- revision 1
- checksums rmd160 a362905eab0ce835ae9acaeabf5d5f46e72289a9 \
- sha256 bc3be18d87cc2de812ba4ee3f00e9c27052e99fe2b2e3905236ce236522448da
</del><ins>+ github.setup gnss-sdr gnss-sdr 8abe0486e9ef43e3082b66932a0b7e5018582027
+ version 20151103
+ checksums rmd160 2769b23825b180c095493702990dbf77ecacf97b \
+ sha256 f353f9a9e6061e5798217db832dc1f70b360597be1e7e8e3f7f9470264b278c9
</ins><span class="cx">
</span><span class="cx"> conflicts volk-gnss-sdr volk-gnss-sdr-devel
</span><span class="cx">
</span><ins>+ # temporary patch to fix name of Volk-Gnss-Sdr cmake file
+
+ patchfiles-append patch-Volk_GnssSdrConfig.cmake.next.diff
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # override githib PortGroup homepage setting
</span><span class="lines">@@ -98,3 +108,8 @@
</span><span class="cx">
</span><span class="cx"> configure.args-append \
</span><span class="cx"> -DPYTHON_EXECUTABLE=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/bin/python2.7
</span><ins>+
+# specify where to install cmake files
+
+configure.args-append \
+ -DCMAKE_MODULES_DIR=${prefix}/share/cmake
</ins></span></pre></div>
<a id="trunkdportssciencevolkgnsssdrfilespatchVolk_GnssSdrConfigcmakedeveldiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.devel.diff (0 => 142470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.devel.diff (rev 0)
+++ trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.devel.diff 2015-11-12 17:23:31 UTC (rev 142470)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -147,7 +147,7 @@ if(NOT CMAKE_MODULES_DIR)
+ endif(NOT CMAKE_MODULES_DIR)
+
+ install(
+- FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/VolkConfig.cmake
++ FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Volk_GnssSdrConfig.cmake
+ DESTINATION ${CMAKE_MODULES_DIR}/volk_gnsssdr
+ COMPONENT "volk_gnsssdr_devel"
+ )
+--- cmake/VolkConfig.cmake
++++ /dev/null
+@@ -1,26 +0,0 @@
+-INCLUDE(FindPkgConfig)
+-PKG_CHECK_MODULES(PC_VOLK volk_gnsssdr)
+-
+-FIND_PATH(
+- VOLK_INCLUDE_DIRS
+- NAMES volk_gnsssdr/volk_gnsssdr.h
+- HINTS $ENV{VOLK_DIR}/include
+- ${PC_VOLK_INCLUDEDIR}
+- PATHS /usr/local/include
+- /usr/include
+-)
+-
+-FIND_LIBRARY(
+- VOLK_LIBRARIES
+- NAMES volk_gnsssdr
+- HINTS $ENV{VOLK_DIR}/lib
+- ${PC_VOLK_LIBDIR}
+- PATHS /usr/local/lib
+- /usr/local/lib64
+- /usr/lib
+- /usr/lib64
+-)
+-
+-INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
+-MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
+--- /dev/null
++++ cmake/Volk_GnssSdrConfig.cmake
+@@ -0,0 +1,26 @@
++INCLUDE(FindPkgConfig)
++PKG_CHECK_MODULES(PC_VOLK volk_gnsssdr)
++
++FIND_PATH(
++ VOLK_INCLUDE_DIRS
++ NAMES volk_gnsssdr/volk_gnsssdr.h
++ HINTS $ENV{VOLK_DIR}/include
++ ${PC_VOLK_INCLUDEDIR}
++ PATHS /usr/local/include
++ /usr/include
++)
++
++FIND_LIBRARY(
++ VOLK_LIBRARIES
++ NAMES volk_gnsssdr
++ HINTS $ENV{VOLK_DIR}/lib
++ ${PC_VOLK_LIBDIR}
++ PATHS /usr/local/lib
++ /usr/local/lib64
++ /usr/lib
++ /usr/lib64
++)
++
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
++MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
</ins></span></pre></div>
<a id="trunkdportssciencevolkgnsssdrfilespatchVolk_GnssSdrConfigcmakenextdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.next.diff (0 => 142470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.next.diff (rev 0)
+++ trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.next.diff 2015-11-12 17:23:31 UTC (rev 142470)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -147,7 +147,7 @@ if(NOT CMAKE_MODULES_DIR)
+ endif(NOT CMAKE_MODULES_DIR)
+
+ install(
+- FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/VolkConfig.cmake
++ FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Volk_GnssSdrConfig.cmake
+ DESTINATION ${CMAKE_MODULES_DIR}/volk_gnsssdr
+ COMPONENT "volk_gnsssdr_devel"
+ )
+--- cmake/VolkConfig.cmake
++++ /dev/null
+@@ -1,26 +0,0 @@
+-INCLUDE(FindPkgConfig)
+-PKG_CHECK_MODULES(PC_VOLK volk_gnsssdr)
+-
+-FIND_PATH(
+- VOLK_INCLUDE_DIRS
+- NAMES volk_gnsssdr/volk_gnsssdr.h
+- HINTS $ENV{VOLK_DIR}/include
+- ${PC_VOLK_INCLUDEDIR}
+- PATHS /usr/local/include
+- /usr/include
+-)
+-
+-FIND_LIBRARY(
+- VOLK_LIBRARIES
+- NAMES volk_gnsssdr
+- HINTS $ENV{VOLK_DIR}/lib
+- ${PC_VOLK_LIBDIR}
+- PATHS /usr/local/lib
+- /usr/local/lib64
+- /usr/lib
+- /usr/lib64
+-)
+-
+-INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
+-MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
+--- /dev/null
++++ cmake/Volk_GnssSdrConfig.cmake
+@@ -0,0 +1,26 @@
++INCLUDE(FindPkgConfig)
++PKG_CHECK_MODULES(PC_VOLK volk_gnsssdr)
++
++FIND_PATH(
++ VOLK_INCLUDE_DIRS
++ NAMES volk_gnsssdr/volk_gnsssdr.h
++ HINTS $ENV{VOLK_DIR}/include
++ ${PC_VOLK_INCLUDEDIR}
++ PATHS /usr/local/include
++ /usr/include
++)
++
++FIND_LIBRARY(
++ VOLK_LIBRARIES
++ NAMES volk_gnsssdr
++ HINTS $ENV{VOLK_DIR}/lib
++ ${PC_VOLK_LIBDIR}
++ PATHS /usr/local/lib
++ /usr/local/lib64
++ /usr/lib
++ /usr/lib64
++)
++
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
++MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
</ins></span></pre></div>
<a id="trunkdportssciencevolkgnsssdrfilespatchVolk_GnssSdrConfigcmakereleasediff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.release.diff (0 => 142470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.release.diff (rev 0)
+++ trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.release.diff 2015-11-12 17:23:31 UTC (rev 142470)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -147,7 +147,7 @@ if(NOT CMAKE_MODULES_DIR)
+ endif(NOT CMAKE_MODULES_DIR)
+
+ install(
+- FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/VolkConfig.cmake
++ FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Volk_GnssSdrConfig.cmake
+ DESTINATION ${CMAKE_MODULES_DIR}/volk_gnsssdr
+ COMPONENT "volk_gnsssdr_devel"
+ )
+--- cmake/VolkConfig.cmake
++++ /dev/null
+@@ -1,26 +0,0 @@
+-INCLUDE(FindPkgConfig)
+-PKG_CHECK_MODULES(PC_VOLK volk_gnsssdr)
+-
+-FIND_PATH(
+- VOLK_INCLUDE_DIRS
+- NAMES volk_gnsssdr/volk_gnsssdr.h
+- HINTS $ENV{VOLK_DIR}/include
+- ${PC_VOLK_INCLUDEDIR}
+- PATHS /usr/local/include
+- /usr/include
+-)
+-
+-FIND_LIBRARY(
+- VOLK_LIBRARIES
+- NAMES volk_gnsssdr
+- HINTS $ENV{VOLK_DIR}/lib
+- ${PC_VOLK_LIBDIR}
+- PATHS /usr/local/lib
+- /usr/local/lib64
+- /usr/lib
+- /usr/lib64
+-)
+-
+-INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
+-MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
+--- /dev/null
++++ cmake/Volk_GnssSdrConfig.cmake
+@@ -0,0 +1,26 @@
++INCLUDE(FindPkgConfig)
++PKG_CHECK_MODULES(PC_VOLK volk_gnsssdr)
++
++FIND_PATH(
++ VOLK_INCLUDE_DIRS
++ NAMES volk_gnsssdr/volk_gnsssdr.h
++ HINTS $ENV{VOLK_DIR}/include
++ ${PC_VOLK_INCLUDEDIR}
++ PATHS /usr/local/include
++ /usr/include
++)
++
++FIND_LIBRARY(
++ VOLK_LIBRARIES
++ NAMES volk_gnsssdr
++ HINTS $ENV{VOLK_DIR}/lib
++ ${PC_VOLK_LIBDIR}
++ PATHS /usr/local/lib
++ /usr/local/lib64
++ /usr/lib
++ /usr/lib64
++)
++
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
++MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
</ins></span></pre></div>
<a id="trunkdportssciencevolkgnsssdrfilespatchvolkincludereleasedifffromrev142469trunkdportssciencevolkgnsssdrfilespatchvolkdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/science/volk-gnss-sdr/files/patch-volk-include.release.diff (from rev 142469, trunk/dports/science/volk-gnss-sdr/files/patch-volk.diff) (0 => 142470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/volk-gnss-sdr/files/patch-volk-include.release.diff (rev 0)
+++ trunk/dports/science/volk-gnss-sdr/files/patch-volk-include.release.diff 2015-11-12 17:23:31 UTC (rev 142470)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+--- include/volk_gnsssdr/volk_gnsssdr_complex.h.orig
++++ include/volk_gnsssdr/volk_gnsssdr_complex.h
+@@ -24,6 +24,9 @@
+ #ifndef INCLUDE_VOLK_COMPLEX_H
+ #define INCLUDE_VOLK_COMPLEX_H
+
++#ifndef INCLUDED_VOLK_COMPLEX_H
++#define INCLUDED_VOLK_COMPLEX_H
++
+ /*!
+ * \brief Provide typedefs and operators for all complex types in C and C++.
+ *
+@@ -106,4 +109,6 @@ typedef double complex lv_64fc_t;
+
+ #endif /* __cplusplus */
+
++#endif /* INCLUDED_VOLK_COMPLEX_H */
++
+ #endif /* INCLUDE_VOLK_COMPLEX_H */
</ins></span></pre></div>
<a id="trunkdportssciencevolkgnsssdrfilespatchvolkdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/volk-gnss-sdr/files/patch-volk.diff (142469 => 142470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/volk-gnss-sdr/files/patch-volk.diff 2015-11-12 16:41:55 UTC (rev 142469)
+++ trunk/dports/science/volk-gnss-sdr/files/patch-volk.diff 2015-11-12 17:23:31 UTC (rev 142470)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>---- include/volk_gnsssdr/volk_gnsssdr_complex.h.orig
-+++ include/volk_gnsssdr/volk_gnsssdr_complex.h
-@@ -24,6 +24,9 @@
- #ifndef INCLUDE_VOLK_COMPLEX_H
- #define INCLUDE_VOLK_COMPLEX_H
-
-+#ifndef INCLUDED_VOLK_COMPLEX_H
-+#define INCLUDED_VOLK_COMPLEX_H
-+
- /*!
- * \brief Provide typedefs and operators for all complex types in C and C++.
- *
-@@ -106,4 +109,6 @@ typedef double complex lv_64fc_t;
-
- #endif /* __cplusplus */
-
-+#endif /* INCLUDED_VOLK_COMPLEX_H */
-+
- #endif /* INCLUDE_VOLK_COMPLEX_H */
</del></span></pre>
</div>
</div>
</body>
</html>