<pre style='margin:0'>
tobypeterson pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/800c8f757d594c24bae8b723b26ceb88dbd826fb">https://github.com/macports/macports-ports/commit/800c8f757d594c24bae8b723b26ceb88dbd826fb</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 800c8f7  py-protobuf3: update to 3.6.1 & add python 3.7 support py-absl: add python 3.7 support
</span>800c8f7 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 800c8f757d594c24bae8b723b26ceb88dbd826fb
</span>Author: Toby Peterson <toby@macports.org>
AuthorDate: Tue Aug 21 21:46:41 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    py-protobuf3: update to 3.6.1 & add python 3.7 support
</span><span style='display:block; white-space:pre;color:#404040;'>    py-absl: add python 3.7 support
</span>---
 python/py-absl/Portfile                            |  2 +-
 python/py-protobuf3/Portfile                       | 11 +--
 .../files/patch-py-protobuf3-settings.diff         | 16 ++--
 python/py-protobuf3/files/py37.diff                | 85 ++++++++++++++++++++++
 4 files changed, 100 insertions(+), 14 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-absl/Portfile b/python/py-absl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d462203..38876d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-absl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-absl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ checksums           rmd160 784b5305f0f1893cfed0ca31ac18ad23fd876114 \
</span>                     sha256 73d7d88454b97d54d95946685030962a7226c7a327f1ae925afe977098ef37ec \
                     size   82900
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions     27 35 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions     27 35 36 37
</span> 
 livecheck.name      ${python.rootname}-py
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-protobuf3/Portfile b/python/py-protobuf3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7164000..ed692a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-protobuf3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-protobuf3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup       github 1.0
</span> PortGroup       cxx11 1.1
 
 name            py-protobuf3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version         3.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version         3.6.1
</span> categories-append   devel
 maintainers     nomaintainer
 license         BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,12 +36,13 @@ master_sites    https://github.com/google/protobuf/releases/download/v${version}
</span> distfiles       protobuf-python-${version}.tar.gz
 worksrcdir      protobuf-${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums       sha256  13d3c15ebfad8c28bee203dd4a0f6e600d2a7d2243bac8b5d0e517466500fcae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                rmd160  b2a7574a89fca44cf2b218aa29048909d9aed796
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums       sha256  40f009cb0c190816a52fc21d45c26558ee7d63c3bd511b326bd85739b2fd99a6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                rmd160  ee9f8344a688f636cee409227b36a5161fa88c44 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                size    4748789
</span> 
 platforms       darwin
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 35 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 35 36 37
</span> 
 if {${name} ne ${subport}} {
     depends_build   port:py${python.version}-setuptools \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +55,7 @@ if {${name} ne ${subport}} {
</span>     # tricks to force the right -stdlib setting
     # and to put a needed CXX flag on the 10.6 build
     # see https://trac.macports.org/ticket/56482
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append patch-py-protobuf3-settings.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-py-protobuf3-settings.diff py37.diff
</span> 
     post-patch {
         set extraargs ""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-protobuf3/files/patch-py-protobuf3-settings.diff b/python/py-protobuf3/files/patch-py-protobuf3-settings.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6293b45..6efc381 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-protobuf3/files/patch-py-protobuf3-settings.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-protobuf3/files/patch-py-protobuf3-settings.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> --- setup.py.old  2018-05-24 19:42:16.000000000 -0700
 +++ setup.py   2018-05-24 19:43:21.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -197,6 +197,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       v = float('.'.join(v.split('.')[:2]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       if v >= 10.12:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         extra_compile_args.append('-std=c++11')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        extra_compile_args.append('@@MACPORTS_STDLIB@@')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        extra_compile_args.append('@@MACPORTS_EXTRAARG@@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -204,6 +204,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     v, _, _ = platform.mac_ver()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if v:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       extra_compile_args.append('-std=c++11')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      extra_compile_args.append('@@MACPORTS_STDLIB@@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      extra_compile_args.append('@@MACPORTS_EXTRAARG@@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     elif os.getenv('KOKORO_BUILD_NUMBER') or os.getenv('KOKORO_BUILD_ID'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       extra_compile_args.append('-std=c++11')
</span>  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     if warnings_as_errors in sys.argv:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       extra_compile_args.append('-Werror')
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-protobuf3/files/py37.diff b/python/py-protobuf3/files/py37.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8544993
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-protobuf3/files/py37.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,85 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit 0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Ben Webb <ben@salilab.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date:   Thu Jul 12 10:58:10 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    Add Python 3.7 compatibility (#4862)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    Compilation of Python wrappers fails with Python 3.7 because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    the Python folks changed their C API such that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PyUnicode_AsUTF8AndSize() now returns a const char* rather
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    than a char*. Add a patch to work around. Relates #4086.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git google/protobuf/pyext/descriptor.cc google/protobuf/pyext/descriptor.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8af0cb12..19a1c38a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- google/protobuf/pyext/descriptor.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ google/protobuf/pyext/descriptor.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     (PyUnicode_Check(ob)? \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git google/protobuf/pyext/descriptor_containers.cc google/protobuf/pyext/descriptor_containers.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bc007f7e..0153664f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- google/protobuf/pyext/descriptor_containers.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ google/protobuf/pyext/descriptor_containers.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     (PyUnicode_Check(ob)? \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git google/protobuf/pyext/descriptor_pool.cc google/protobuf/pyext/descriptor_pool.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 95882aeb..962accc6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- google/protobuf/pyext/descriptor_pool.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ google/protobuf/pyext/descriptor_pool.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     (PyUnicode_Check(ob)? \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git google/protobuf/pyext/extension_dict.cc google/protobuf/pyext/extension_dict.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 018b5c2c..174c5470 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- google/protobuf/pyext/extension_dict.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ google/protobuf/pyext/extension_dict.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,7 +53,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     (PyUnicode_Check(ob)? \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git google/protobuf/pyext/message.cc google/protobuf/pyext/message.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 53736b9c..b2984509 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- google/protobuf/pyext/message.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ google/protobuf/pyext/message.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,7 +79,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     (PyUnicode_Check(ob)? PyUnicode_AsUTF8(ob): PyBytes_AsString(ob))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     (PyUnicode_Check(ob)? \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1529,7 +1529,7 @@ PyObject* HasField(CMessage* self, PyObject* arg) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  field_name = PyUnicode_AsUTF8AndSize(arg, &size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  field_name = const_cast<char*>(PyUnicode_AsUTF8AndSize(arg, &size));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (!field_name) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   }
</span></pre><pre style='margin:0'>

</pre>