<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/d2b8fb30b64f26595dbaf7ab82b33f4a73eb74b9">https://github.com/macports/macports-ports/commit/d2b8fb30b64f26595dbaf7ab82b33f4a73eb74b9</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 d2b8fb3 osmocore-devel: update to 20191211-a47d37c9
</span>d2b8fb3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d2b8fb30b64f26595dbaf7ab82b33f4a73eb74b9
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sun Dec 15 07:47:04 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> osmocore-devel: update to 20191211-a47d37c9
</span>---
science/osmocore/Portfile | 21 +++++---
science/osmocore/files/patch-fix-python.devel.diff | 60 ++++++++++++++++++----
2 files changed, 65 insertions(+), 16 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 15702bc..db4e02f 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;'>@@ -39,11 +39,11 @@ if {${subport} eq ${name}} {
</span> } else {
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup osmocom libosmocore 278a6c8fcfc04084cd459a990ad93077b2a9cab0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20191203-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 fe09f4e6bb4d89ede401f58120158f952c5479b9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f14d6a288a2f422ae790a3392d3353985c23149230ccc23200f1a899f6d15660 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1277044
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup osmocom libosmocore a47d37c94684ba688a6eec06d0346ee13b03aad4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20191211-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b254f99796f9f0e5ea641ce2100dbb18311a91df \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4a09de363e1e684da77d03992357f7ee9f61f6eea4e90e8097b95880213e3a02 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1277471
</span> revision 0
# fix 'timer_clockgettime.c' to work with OSs that don't provide
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +55,15 @@ if {${subport} eq ${name}} {
</span>
patchfiles-append patch-fix-python.devel.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix use of Python2, part 2, for devel only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PYTHON_EXECUTABLE@|${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ utils/gsmtap.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ utils/gsmtap_logread.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ contrib/struct_endianess.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ contrib/fsm-to-dot.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +89,7 @@ patchfiles-append patch-configure.ac.diff
</span>
patchfiles-append patch-include_osmocom_coding_gsm0503_parity.h.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix use of Python2, part 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix use of Python2, part 2, for both release and devel
</span>
post-patch {
reinplace "s|@PYTHON_EXECUTABLE@|${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix-python.devel.diff b/science/osmocore/files/patch-fix-python.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f75d88b..296b41d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-fix-python.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-fix-python.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,58 +1,98 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/contrib/fsm-to-dot.py b/contrib/fsm-to-dot.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 85e2806..4e92dcd 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/contrib/fsm-to-dot.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/contrib/fsm-to-dot.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!@PYTHON_EXECUTABLE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __doc__ = '''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fsm-to-dot: convert FSM definitons to graph images
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/contrib/struct_endianess.py b/contrib/struct_endianess.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index be73fbe..67f67cd 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/contrib/struct_endianess.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/contrib/struct_endianess.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!@PYTHON_EXECUTABLE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '''Using mad regexes, automatically make sure that all structs with sub-byte
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ integers have matching big-endian definitions. The idea is to save a lot of
</span> diff --git a/include/Makefile.am b/include/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 19695d1..6a746b1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d76addd..dbe789b 100644
</span> --- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -180,7 +180,7 @@
$(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)python $(top_srcdir)/utils/conv_gen.py gen_header gsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(AM_V_GEN)python3 $(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 29299a6..fe519ae 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4a1faca..7a7bfb9 100644
</span> --- a/src/gsm/Makefile.am
+++ b/src/gsm/Makefile.am
@@ -49,6 +49,6 @@
# 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)python $(top_srcdir)/utils/conv_gen.py gen_codes gsm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(AM_V_GEN)python3 $(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 18d4bb4..6191867 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3a3ea37..161d06f 100644
</span> --- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -362,7 +362,7 @@
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)python $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(AM_V_GEN)python3 $(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
if ENABLE_EXT_TESTS
diff --git a/utils/conv_codes_gsm.py b/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index ec77660..48b161a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e189985..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/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python3
</span> +#!@PYTHON_EXECUTABLE@
# -*- coding: utf-8 -*-
from conv_gen import ConvolutionalCode
diff --git a/utils/conv_gen.py b/utils/conv_gen.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 06283d8..88968d3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d2eda15..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/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python3
</span> +#!@PYTHON_EXECUTABLE@
mod_license = """
/*
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/utils/gsmtap.py b/utils/gsmtap.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b7211ad..b1a9365 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/utils/gsmtap.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/utils/gsmtap.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!@PYTHON_EXECUTABLE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # License: MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright 2019 by Sysmocom s.f.m.c. GmbH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Author: Alexander Couzens <lynxis@fe80.eu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/utils/gsmtap_logread.py b/utils/gsmtap_logread.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a29f149..629c394 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/utils/gsmtap_logread.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/utils/gsmtap_logread.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!@PYTHON_EXECUTABLE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # License: MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright 2019 by Sysmocom s.f.m.c. GmbH
</span></pre><pre style='margin:0'>
</pre>