<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/4e92cb4648f8c98a097112fb769c6b5a2c2a5a53">https://github.com/macports/macports-ports/commit/4e92cb4648f8c98a097112fb769c6b5a2c2a5a53</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 4e92cb4 osmocore: new port.
</span>4e92cb4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4e92cb4648f8c98a097112fb769c6b5a2c2a5a53
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Feb 21 20:19:06 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> osmocore: new port.
</span>---
science/osmocore/Portfile | 63 ++++++++++++++++++++++
science/osmocore/files/patch-fix-python.diff | 56 +++++++++++++++++++
.../patch-include_osmocom_coding_gsm0503_parity.h | 28 ++++++++++
.../files/patch-include_osmocom_core_stats.h | 23 ++++++++
4 files changed, 170 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/Portfile b/science/osmocore/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f414fcf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,63 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name osmocore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {michaelld @michaelld} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description ${name} provides a set of C-language libraries that form the core infrastructure of many Osmocom Open Source Mobile Communications projects.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories science comms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup osmocom libosmocore f4cd228f1e238fbc824cdbdbd5eb30d99c44e079
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20180215
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ba3513c907ba44cadc4ede34da0f935424d6c187 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 59b7b4ceb795b2f68b98239566875f0d2490e438803c2090f32938abbb161144
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:doxygen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnutls \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix use of Python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-python.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</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;'>+ ${worksrcpath}/include/Makefile.am \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/gsm/Makefile.am \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tests/Makefile.am \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/utils/conv_codes_gsm.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/utils/conv_gen.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix stats.h to work within MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-include_osmocom_core_stats.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix header variable declaration to be "extern" even though it should
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# not technically be necessary.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-include_osmocom_coding_gsm0503_parity.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use autotools to get ready to configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "touch config.h.in && ${prefix}/bin/glibtoolize -i && ${prefix}/bin/aclocal && ${prefix}/bin/automake -a && ${prefix}/bin/autoconf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# remove top-level library path, such that internal libraries are used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# instead of any already-installed ones.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-delete -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --disable-pcsc --disable-pseudotalloc
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..babb9a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/Makefile.am b/include/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f95d90c..b5b0341 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/include/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/include/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,7 +160,7 @@ osmocom/core/crc%gen.h: osmocom/core/crcXXgen.h.tpl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(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_EXECUTABLE@ $(top_srcdir)/utils/conv_gen.py gen_header gsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --target-path $(builddir)/osmocom/gsm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLEANFILES = osmocom/gsm/gsm0503.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f85aba3..3bfaea7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/gsm/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/gsm/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,6 +47,6 @@ EXTRA_DIST = libosmogsm.map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Convolutional codes generation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gsm0503_conv.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(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_EXECUTABLE@ $(top_srcdir)/utils/conv_gen.py gen_codes gsm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLEANFILES = gsm0503_conv.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tests/Makefile.am b/tests/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5dd8e22..3d2a44d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tests/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tests/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -277,5 +277,5 @@ $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mv $@.tmp $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(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_EXECUTABLE@ $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --target-path $(builddir)/conv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/utils/conv_codes_gsm.py b/utils/conv_codes_gsm.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index eeed4fd..ba84b5a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/utils/conv_codes_gsm.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/utils/conv_codes_gsm.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/python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!@PYTHON_EXECUTABLE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -*- coding: utf-8 -*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from conv_gen import ConvolutionalCode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from conv_gen import poly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/utils/conv_gen.py b/utils/conv_gen.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6b6b267..88968d3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/utils/conv_gen.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/utils/conv_gen.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/python2
</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;'>+ mod_license = """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-include_osmocom_coding_gsm0503_parity.h b/science/osmocore/files/patch-include_osmocom_coding_gsm0503_parity.h
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5379e82
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-include_osmocom_coding_gsm0503_parity.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/osmocom/coding/gsm0503_parity.h b/include/osmocom/coding/gsm0503_parity.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 28a5444..6459b40 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/include/osmocom/coding/gsm0503_parity.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/include/osmocom/coding/gsm0503_parity.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,14 +10,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * \file gsm0503_parity.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const struct osmo_crc64gen_code gsm0503_fire_crc40;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const struct osmo_crc16gen_code gsm0503_cs234_crc16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const struct osmo_crc8gen_code gsm0503_mcs_crc8_hdr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const struct osmo_crc16gen_code gsm0503_mcs_crc12;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const struct osmo_crc8gen_code gsm0503_rach_crc6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const struct osmo_crc16gen_code gsm0503_sch_crc10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const struct osmo_crc8gen_code gsm0503_tch_fr_crc3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const struct osmo_crc8gen_code gsm0503_tch_efr_crc8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const struct osmo_crc8gen_code gsm0503_amr_crc6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern const struct osmo_crc64gen_code gsm0503_fire_crc40;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern const struct osmo_crc16gen_code gsm0503_cs234_crc16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern const struct osmo_crc8gen_code gsm0503_mcs_crc8_hdr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern const struct osmo_crc16gen_code gsm0503_mcs_crc12;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern const struct osmo_crc8gen_code gsm0503_rach_crc6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern const struct osmo_crc16gen_code gsm0503_sch_crc10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern const struct osmo_crc8gen_code gsm0503_tch_fr_crc3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern const struct osmo_crc8gen_code gsm0503_tch_efr_crc8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern const struct osmo_crc8gen_code gsm0503_amr_crc6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*! @} */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-include_osmocom_core_stats.h b/science/osmocore/files/patch-include_osmocom_core_stats.h
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e9f0bed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-include_osmocom_core_stats.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/osmocom/core/stats.h b/include/osmocom/core/stats.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e4d46ba..6546580 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/include/osmocom/core/stats.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/include/osmocom/core/stats.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,12 +24,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * \file stats.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* a bit of a crude way to disable building/using this on (bare iron)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * embedded systems. We cannot use the autoconf-defined HAVE_... macros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * here, as that only works at library compile time, not at application
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * compile time */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <arpa/inet.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,5 +135,4 @@ int osmo_stats_reporter_send_buffer(struct osmo_stats_reporter *srep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int osmo_stats_reporter_udp_open(struct osmo_stats_reporter *srep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int osmo_stats_reporter_udp_close(struct osmo_stats_reporter *srep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* unix */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*! @} */
</span></pre><pre style='margin:0'>
</pre>