<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/99b835f80832af44c051298436042a5923c1fd0f">https://github.com/macports/macports-ports/commit/99b835f80832af44c051298436042a5923c1fd0f</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 99b835f osmocore: update to 94c00312 (20180702).
</span>99b835f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 99b835f80832af44c051298436042a5923c1fd0f
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Jul 5 11:41:41 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> osmocore: update to 94c00312 (20180702).
</span>---
science/osmocore/Portfile | 10 ++++----
science/osmocore/files/patch-configure.ac.diff | 4 ++--
science/osmocore/files/patch-fix-python.diff | 28 +++++++++++-----------
.../osmocore/files/patch-fix_clock_gettime.diff | 8 +++----
4 files changed, 25 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/Portfile b/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ff59049..eed97ba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,11 +12,11 @@ categories science comms
</span> license GPL-3
platforms darwin macosx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup osmocom libosmocore f1e13d6081920b7f65c0ff70c19fb638a7fc86fa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20180625
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f1ef575f0f37e05ffe174468e45ce64449997eaa\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 127b24afba553fc67b82ab53b7f633bf4e7f7d08a0461337600919f0017ad31a\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1044381
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup osmocom libosmocore 94c0031297abb0bb42a4ea23e68f944622f50469
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20180702
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4f56c42ee40b415b7b79d15ead491e394b1bc2eb\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 df70dc095bcd2315f475175e8dbd9507594f623df973a851f5db7542a098f52d\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1045056
</span>
depends_build-append \
port:automake \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-configure.ac.diff b/science/osmocore/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a04c7dd..257333d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ index 7f2aabd..8cfe69f 100644
</span>
dnl *This* is the root dir, even if an install-sh exists in ../ or ../../
AC_CONFIG_AUX_DIR([.])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -343,8 +341,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -345,8 +343,7 @@
</span> AC_MSG_RESULT([CFLAGS="$CFLAGS"])
AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ index 7f2aabd..8cfe69f 100644
</span> libosmocodec.pc
libosmocoding.pc
libosmovty.pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -372,4 +369,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -374,4 +371,5 @@
</span> Doxyfile.coding
Doxyfile.gb
Doxyfile.ctrl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix-python.diff b/science/osmocore/files/patch-fix-python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6898284..94a24ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-fix-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-fix-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,55 +1,55 @@
</span> diff --git a/include/Makefile.am b/include/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index f95d90c..b5b0341 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 38ba14c..ffed583 100644
</span> --- a/include/Makefile.am
+++ b/include/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -162,7 +162,7 @@ osmocom/core/crc%gen.h: osmocom/core/crcXXgen.h.tpl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,7 +162,7 @@
</span> $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@
osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(AM_V_GEN)python2 $(top_srcdir)/utils/conv_gen.py gen_header gsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_header gsm \
</span> + $(AM_V_GEN)@PYTHON_EXECUTABLE@ $(top_srcdir)/utils/conv_gen.py gen_header gsm \
--target-path $(builddir)/osmocom/gsm
CLEANFILES = osmocom/gsm/gsm0503.h
diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index f85aba3..3bfaea7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5387e3a..e19fde4 100644
</span> --- a/src/gsm/Makefile.am
+++ b/src/gsm/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,6 +47,6 @@ EXTRA_DIST = libosmogsm.map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,6 +47,6 @@
</span>
# Convolutional codes generation
gsm0503_conv.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(AM_V_GEN)python2 $(top_srcdir)/utils/conv_gen.py gen_codes gsm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_codes gsm
</span> + $(AM_V_GEN)@PYTHON_EXECUTABLE@ $(top_srcdir)/utils/conv_gen.py gen_codes gsm
CLEANFILES = gsm0503_conv.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5dd8e22..3d2a44d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index db4e520..36ca8b7 100644
</span> --- a/tests/Makefile.am
+++ b/tests/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -280,5 +280,5 @@ $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -280,5 +280,5 @@
</span> mv $@.tmp $@
conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(AM_V_GEN)python2 $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \
</span> + $(AM_V_GEN)@PYTHON_EXECUTABLE@ $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \
--target-path $(builddir)/conv
diff --git a/utils/conv_codes_gsm.py b/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index eeed4fd..ba84b5a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ec77660..48b161a 100644
</span> --- a/utils/conv_codes_gsm.py
+++ b/utils/conv_codes_gsm.py
@@ -1,4 +1,4 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python
</span> +#!@PYTHON_EXECUTABLE@
# -*- coding: utf-8 -*-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> from conv_gen import ConvolutionalCode
<span style='display:block; white-space:pre;background:#ffe0e0;'>- from conv_gen import poly
</span> diff --git a/utils/conv_gen.py b/utils/conv_gen.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6b6b267..88968d3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 06283d8..88968d3 100644
</span> --- a/utils/conv_gen.py
+++ b/utils/conv_gen.py
@@ -1,4 +1,4 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python
</span> +#!@PYTHON_EXECUTABLE@
mod_license = """
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix_clock_gettime.diff b/science/osmocore/files/patch-fix_clock_gettime.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ee4b30c..f780b6a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-fix_clock_gettime.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-fix_clock_gettime.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ index c5d1236..559d14a 100644
</span> # for src/conv.c
AC_FUNC_ALLOCA
AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DLOPEN="$LIBS";LIBS=""])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -115,7 +121,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,7 +123,7 @@
</span> CHECK_TM_INCLUDES_TM_GMTOFF
dnl Generate the output
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -291,7 +291,7 @@ diff --git a/src/panic.c b/src/panic.c
</span> index a08f89f..49096ef 100644
--- a/src/panic.c
+++ b/src/panic.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,7 +30,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span> #include <osmocom/core/panic.h>
#include <osmocom/core/backtrace.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -382,7 +382,7 @@ diff --git a/src/timer_clockgettime.c b/src/timer_clockgettime.c
</span> index 8d9760c..5ba2028 100644
--- a/src/timer_clockgettime.c
+++ b/src/timer_clockgettime.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,8 +49,100 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,8 +52,100 @@
</span> #include <sys/time.h>
#include <time.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -483,7 +483,7 @@ index 8d9760c..5ba2028 100644
</span> /*! An internal structure to handle overriden time for each clock type. */
struct fakeclock {
bool override;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,7 +191,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,7 +194,7 @@
</span> {
struct fakeclock* c = clkid_to_fakeclock(clk_id);
if (!c || !c->override)
</pre><pre style='margin:0'>
</pre>