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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/287c41626fe58fcf0745ec38441d71bc3215e0c4">https://github.com/macports/macports-ports/commit/287c41626fe58fcf0745ec38441d71bc3215e0c4</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 287c416  gr-gsm: update to 592ec9b7 (20180812)
</span>287c416 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 287c41626fe58fcf0745ec38441d71bc3215e0c4
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Sep 17 18:05:43 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    gr-gsm: update to 592ec9b7 (20180812)
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    + add patches to allow for building
</span><span style='display:block; white-space:pre;color:#404040;'>    + allow use of osmocore or osmocore-devel
</span>---
 science/gr-gsm/Portfile                            | 22 +++++++----
 science/gr-gsm/files/patch-CMakeLists.txt.diff     |  2 +-
 science/gr-gsm/files/patch-add_endian.h.diff       | 37 ++++++++++++++++++
 .../gr-gsm/files/patch-fix-local-library-load.diff | 44 ++++++++++++++++++++++
 4 files changed, 97 insertions(+), 8 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-gsm/Portfile b/science/gr-gsm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 547abb2..0573f43 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-gsm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-gsm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,12 +4,11 @@ PortSystem          1.0
</span> PortGroup           cmake 1.0
 PortGroup           github 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        ptrkrysik gr-gsm e24860f9c018b761d3380d9ceaea0dff46ead6f4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version             20180406
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160 ea2541592ffc6fb315b842b9e5b565a7102404bd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256 6f3abdce6e85b8330d56a297751216332164d22f447c8143046d19554698e177 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size   382921
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        ptrkrysik gr-gsm 592ec9b7859f544b297e9352323b45ceb450a68a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             20180812
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160 76289afc52c484bdb1a4a60a18b6cb85f2a4ba3d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256 d628af9a27130a89458efd9f91056457e97f01a66ee5809455f0c95607033d41 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size   413183
</span> 
 # overload the github livecheck branch.
 # when master is more advanced, comment this out.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +44,7 @@ depends_build-append \
</span> depends_lib-append \
     port:boost \
     path:lib/libvolk.dylib:volk \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    port:osmocore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    path:lib/libosmocore.dylib:osmocore
</span> 
 depends_test-append \
     port:cppunit
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +67,15 @@ patchfiles-append patch-CMakeLists.txt.diff
</span> 
 patchfiles-append patch-add-boost-thread.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# temporary patch to #include <grgsm/endian.h> where requred
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-add_endian.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix using GRCC, which will load the just-built swig .so and hence
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the just-built gr-gsm library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-local-library-load.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # do VPATH (out of source tree) build
 
 cmake.out_of_source yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-gsm/files/patch-CMakeLists.txt.diff b/science/gr-gsm/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b84c69..1464e1d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-gsm/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-gsm/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
</span> index 748f651..326cf64 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -251,8 +251,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -261,8 +261,11 @@
</span>  ########################################################################
  # Install cmake search helper for this library
  ########################################################################
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-gsm/files/patch-add_endian.h.diff b/science/gr-gsm/files/patch-add_endian.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7aa2467
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-gsm/files/patch-add_endian.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/misc_utils/trx_burst_if_impl.cc b/lib/misc_utils/trx_burst_if_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8f458b0..650a2e4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/trx/trx_burst_if_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/trx/trx_burst_if_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,6 +30,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "grgsm/misc_utils/udp_socket.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "trx_burst_if_impl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <grgsm/endian.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define BURST_SIZE     148
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DATA_IF_MTU    160
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/transmitter/gen_test_ab_impl.cc b/lib/transmitter/gen_test_ab_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bb9c9f6..30d1822 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/transmitter/gen_test_ab_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/transmitter/gen_test_ab_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gnuradio/io_signature.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <grgsm/gsmtap.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <grgsm/gsm_constants.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <grgsm/endian.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gen_test_ab_impl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/transmitter/txtime_setter_impl.cc b/lib/transmitter/txtime_setter_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3c07cc6..8bd43db 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/transmitter/txtime_setter_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/transmitter/txtime_setter_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gnuradio/io_signature.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <grgsm/gsmtap.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <grgsm/endian.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "txtime_setter_impl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-gsm/files/patch-fix-local-library-load.diff b/science/gr-gsm/files/patch-fix-local-library-load.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2a8b0e1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-gsm/files/patch-fix-local-library-load.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake/Modules/GrccCompile.cmake b/cmake/Modules/GrccCompile.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4a917c5..a33969a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/Modules/GrccCompile.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/Modules/GrccCompile.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,11 +30,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(REPLACE ";" ":" PYTHONPATH "${PYTHONPATH}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set(LD_PATH_VAR "LD_LIBRARY_PATH")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(LD_PATH_VAR "DYLD_LIBRARY_PATH")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set(LD_PATH ${CMAKE_BINARY_DIR}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macro(GRCC_COMPILE file_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(${CMAKE_VERSION} VERSION_LESS "3.2.0") #use wrapper script to set the environment on systems without cmake 3.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ADD_CUSTOM_COMMAND(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            COMMAND /bin/sh ${CMAKE_SOURCE_DIR}/cmake/Modules/GrccCompileWrapper.sh "${PYTHONPATH}" "${CMAKE_SOURCE_DIR}/grc" "${PC_GNURADIO_RUNTIME_PREFIX}/${GR_RUNTIME_DIR}/grcc -d ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${file_name}.grc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            COMMAND /bin/sh ${CMAKE_SOURCE_DIR}/cmake/Modules/GrccCompileWrapper.sh "${PYTHONPATH}" ${LD_PATH_VAR} ${LD_PATH} "${CMAKE_SOURCE_DIR}/grc" "${PC_GNURADIO_RUNTIME_PREFIX}/${GR_RUNTIME_DIR}/grcc -d ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${file_name}.grc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             COMMAND "${CMAKE_COMMAND}" -E rename ${CMAKE_CURRENT_BINARY_DIR}/${file_name}.py ${CMAKE_CURRENT_BINARY_DIR}/${file_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             DEPENDS ${file_name}.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ADD_CUSTOM_COMMAND(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             COMMAND "${CMAKE_COMMAND}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                -E env PYTHONPATH="${PYTHONPATH}" GRC_BLOCKS_PATH=${CMAKE_SOURCE_DIR}/grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                -E env PYTHONPATH="${PYTHONPATH}" ${LD_PATH_VAR}="${LD_PATH}" GRC_BLOCKS_PATH=${CMAKE_SOURCE_DIR}/grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 ${PC_GNURADIO_RUNTIME_PREFIX}/${GR_RUNTIME_DIR}/grcc -d ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 ${CMAKE_CURRENT_SOURCE_DIR}/${file_name}.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             COMMAND "${CMAKE_COMMAND}" -E rename ${CMAKE_CURRENT_BINARY_DIR}/${file_name}.py ${CMAKE_CURRENT_BINARY_DIR}/${file_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake/Modules/GrccCompileWrapper.sh b/cmake/Modules/GrccCompileWrapper.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6c7f60f..e1fb199 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/Modules/GrccCompileWrapper.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/Modules/GrccCompileWrapper.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export PYTHONPATH="$1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export GRC_BLOCKS_PATH="$2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-eval "$3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++export $3="$4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++eval "$5"
</span></pre><pre style='margin:0'>

</pre>