py-protobuf: updated to 3.7.0

version 3.7.0:
Python
* Added Python 3.7 compatibility.
* Modified ParseFromString to return bytes parsed .
* Introduce Proto C API.
* FindFileContainingSymbol in descriptor pool is now able to find field and enum values.
* reflection.MakeClass()  and  reflection.ParseMessage() are deprecated.
* Added DescriptorPool.FindMethodByName() method in pure python (c extension alreay has it)
* Flipped proto3 to preserve unknown fields by default.
* Added support for memoryview in python3 proto message parsing.
* Added MergeFrom for repeated scalar fields in c extension (pure python already has it)
* Surrogates are now rejected at setters in python3.
* Added public unknown field API.
* RecursionLimit is also set to max if allow_oversize_protos is enabled.
* Disallow duplicate scalars in proto3 text_format parse.
* Fix some segment faults for c extension map field.

14 files changed, 18 insertions, 523 deletions

diff --git a/devel/py-protobuf/Makefile b/devel/py-protobuf/Makefile
index e186deedef3..18fdb72b263 100644
--- a/devel/py-protobuf/Makefile
+++ b/devel/py-protobuf/Makefile
@@ -1,26 +1,24 @@
-# $NetBSD: Makefile,v 1.16 2019/01/08 05:56:19 markd Exp $
+# $NetBSD: Makefile,v 1.17 2019/03/21 21:29:08 adam Exp $
 
-.include "../../devel/protobuf/Makefile.common"
+DISTNAME=	protobuf-3.7.0
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	devel python
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/protobuf/}
 
-DISTNAME=	protobuf-python-${PROTOBUFVER}
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python//}
-CATEGORIES+=	python
-
-MAINTAINER=	khorben@defora.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://developers.google.com/protocol-buffers/
 COMMENT=	Python bindings for protobuf
+LICENSE=	modified-bsd
+
+DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+DEPENDS+=	${PYPKGPREFIX}-six>=1.9:../../lang/py-six
 
 USE_LANGUAGES+=	c c++11
-CFLAGS+=	-std=c++11	# NetBSD complains without this
 
-PYSETUPSUBDIR=	python
+MAKE_ENV+=		PROTOC=${PREFIX}/bin/protoc
 PYSETUPBUILDARGS=	--cpp_implementation
 PYSETUPINSTALLARGS=	--cpp_implementation
 
-DEPENDS+=	${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython
-DEPENDS+=	${PYPKGPREFIX}-six>=1.9:../../lang/py-six
-
-EGG_NAME=	protobuf-${PKGVERSION_NOREV}
-
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-protobuf/PLIST b/devel/py-protobuf/PLIST
index 51853255626..98b5ec47d6f 100644
--- a/devel/py-protobuf/PLIST
+++ b/devel/py-protobuf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2019/01/06 11:21:06 markd Exp $
+@comment $NetBSD: PLIST,v 1.10 2019/03/21 21:29:08 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -52,9 +52,6 @@ ${PYSITELIB}/google/protobuf/internal/_api_implementation.so
 ${PYSITELIB}/google/protobuf/internal/_parameterized.py
 ${PYSITELIB}/google/protobuf/internal/_parameterized.pyc
 ${PYSITELIB}/google/protobuf/internal/_parameterized.pyo
-${PYSITELIB}/google/protobuf/internal/any_test_pb2.py
-${PYSITELIB}/google/protobuf/internal/any_test_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/any_test_pb2.pyo
 ${PYSITELIB}/google/protobuf/internal/api_implementation.py
 ${PYSITELIB}/google/protobuf/internal/api_implementation.pyc
 ${PYSITELIB}/google/protobuf/internal/api_implementation.pyo
@@ -64,129 +61,30 @@ ${PYSITELIB}/google/protobuf/internal/containers.pyo
 ${PYSITELIB}/google/protobuf/internal/decoder.py
 ${PYSITELIB}/google/protobuf/internal/decoder.pyc
 ${PYSITELIB}/google/protobuf/internal/decoder.pyo
-${PYSITELIB}/google/protobuf/internal/descriptor_database_test.py
-${PYSITELIB}/google/protobuf/internal/descriptor_database_test.pyc
-${PYSITELIB}/google/protobuf/internal/descriptor_database_test.pyo
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test.py
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test.pyc
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test.pyo
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test1_pb2.py
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test1_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test1_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test2_pb2.py
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test2_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test2_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/descriptor_test.py
-${PYSITELIB}/google/protobuf/internal/descriptor_test.pyc
-${PYSITELIB}/google/protobuf/internal/descriptor_test.pyo
 ${PYSITELIB}/google/protobuf/internal/encoder.py
 ${PYSITELIB}/google/protobuf/internal/encoder.pyc
 ${PYSITELIB}/google/protobuf/internal/encoder.pyo
 ${PYSITELIB}/google/protobuf/internal/enum_type_wrapper.py
 ${PYSITELIB}/google/protobuf/internal/enum_type_wrapper.pyc
 ${PYSITELIB}/google/protobuf/internal/enum_type_wrapper.pyo
-${PYSITELIB}/google/protobuf/internal/factory_test1_pb2.py
-${PYSITELIB}/google/protobuf/internal/factory_test1_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/factory_test1_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/factory_test2_pb2.py
-${PYSITELIB}/google/protobuf/internal/factory_test2_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/factory_test2_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/file_options_test_pb2.py
-${PYSITELIB}/google/protobuf/internal/file_options_test_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/file_options_test_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/generator_test.py
-${PYSITELIB}/google/protobuf/internal/generator_test.pyc
-${PYSITELIB}/google/protobuf/internal/generator_test.pyo
-${PYSITELIB}/google/protobuf/internal/import_test_package/__init__.py
-${PYSITELIB}/google/protobuf/internal/import_test_package/__init__.pyc
-${PYSITELIB}/google/protobuf/internal/import_test_package/__init__.pyo
-${PYSITELIB}/google/protobuf/internal/import_test_package/inner_pb2.py
-${PYSITELIB}/google/protobuf/internal/import_test_package/inner_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/import_test_package/inner_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/import_test_package/outer_pb2.py
-${PYSITELIB}/google/protobuf/internal/import_test_package/outer_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/import_test_package/outer_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/json_format_test.py
-${PYSITELIB}/google/protobuf/internal/json_format_test.pyc
-${PYSITELIB}/google/protobuf/internal/json_format_test.pyo
-${PYSITELIB}/google/protobuf/internal/message_factory_test.py
-${PYSITELIB}/google/protobuf/internal/message_factory_test.pyc
-${PYSITELIB}/google/protobuf/internal/message_factory_test.pyo
 ${PYSITELIB}/google/protobuf/internal/message_listener.py
 ${PYSITELIB}/google/protobuf/internal/message_listener.pyc
 ${PYSITELIB}/google/protobuf/internal/message_listener.pyo
-${PYSITELIB}/google/protobuf/internal/message_set_extensions_pb2.py
-${PYSITELIB}/google/protobuf/internal/message_set_extensions_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/message_set_extensions_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/message_test.py
-${PYSITELIB}/google/protobuf/internal/message_test.pyc
-${PYSITELIB}/google/protobuf/internal/message_test.pyo
-${PYSITELIB}/google/protobuf/internal/missing_enum_values_pb2.py
-${PYSITELIB}/google/protobuf/internal/missing_enum_values_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/missing_enum_values_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/more_extensions_dynamic_pb2.py
-${PYSITELIB}/google/protobuf/internal/more_extensions_dynamic_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/more_extensions_dynamic_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/more_extensions_pb2.py
-${PYSITELIB}/google/protobuf/internal/more_extensions_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/more_extensions_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/more_messages_pb2.py
-${PYSITELIB}/google/protobuf/internal/more_messages_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/more_messages_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/no_package_pb2.py
-${PYSITELIB}/google/protobuf/internal/no_package_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/no_package_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/packed_field_test_pb2.py
-${PYSITELIB}/google/protobuf/internal/packed_field_test_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/packed_field_test_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/proto_builder_test.py
-${PYSITELIB}/google/protobuf/internal/proto_builder_test.pyc
-${PYSITELIB}/google/protobuf/internal/proto_builder_test.pyo
 ${PYSITELIB}/google/protobuf/internal/python_message.py
 ${PYSITELIB}/google/protobuf/internal/python_message.pyc
 ${PYSITELIB}/google/protobuf/internal/python_message.pyo
-${PYSITELIB}/google/protobuf/internal/reflection_test.py
-${PYSITELIB}/google/protobuf/internal/reflection_test.pyc
-${PYSITELIB}/google/protobuf/internal/reflection_test.pyo
-${PYSITELIB}/google/protobuf/internal/service_reflection_test.py
-${PYSITELIB}/google/protobuf/internal/service_reflection_test.pyc
-${PYSITELIB}/google/protobuf/internal/service_reflection_test.pyo
-${PYSITELIB}/google/protobuf/internal/symbol_database_test.py
-${PYSITELIB}/google/protobuf/internal/symbol_database_test.pyc
-${PYSITELIB}/google/protobuf/internal/symbol_database_test.pyo
-${PYSITELIB}/google/protobuf/internal/test_bad_identifiers_pb2.py
-${PYSITELIB}/google/protobuf/internal/test_bad_identifiers_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/test_bad_identifiers_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/test_util.py
-${PYSITELIB}/google/protobuf/internal/test_util.pyc
-${PYSITELIB}/google/protobuf/internal/test_util.pyo
 ${PYSITELIB}/google/protobuf/internal/testing_refleaks.py
 ${PYSITELIB}/google/protobuf/internal/testing_refleaks.pyc
 ${PYSITELIB}/google/protobuf/internal/testing_refleaks.pyo
-${PYSITELIB}/google/protobuf/internal/text_encoding_test.py
-${PYSITELIB}/google/protobuf/internal/text_encoding_test.pyc
-${PYSITELIB}/google/protobuf/internal/text_encoding_test.pyo
-${PYSITELIB}/google/protobuf/internal/text_format_test.py
-${PYSITELIB}/google/protobuf/internal/text_format_test.pyc
-${PYSITELIB}/google/protobuf/internal/text_format_test.pyo
 ${PYSITELIB}/google/protobuf/internal/type_checkers.py
 ${PYSITELIB}/google/protobuf/internal/type_checkers.pyc
 ${PYSITELIB}/google/protobuf/internal/type_checkers.pyo
-${PYSITELIB}/google/protobuf/internal/unknown_fields_test.py
-${PYSITELIB}/google/protobuf/internal/unknown_fields_test.pyc
-${PYSITELIB}/google/protobuf/internal/unknown_fields_test.pyo
 ${PYSITELIB}/google/protobuf/internal/well_known_types.py
 ${PYSITELIB}/google/protobuf/internal/well_known_types.pyc
 ${PYSITELIB}/google/protobuf/internal/well_known_types.pyo
-${PYSITELIB}/google/protobuf/internal/well_known_types_test.py
-${PYSITELIB}/google/protobuf/internal/well_known_types_test.pyc
-${PYSITELIB}/google/protobuf/internal/well_known_types_test.pyo
 ${PYSITELIB}/google/protobuf/internal/wire_format.py
 ${PYSITELIB}/google/protobuf/internal/wire_format.pyc
 ${PYSITELIB}/google/protobuf/internal/wire_format.pyo
-${PYSITELIB}/google/protobuf/internal/wire_format_test.py
-${PYSITELIB}/google/protobuf/internal/wire_format_test.pyc
-${PYSITELIB}/google/protobuf/internal/wire_format_test.pyo
 ${PYSITELIB}/google/protobuf/json_format.py
 ${PYSITELIB}/google/protobuf/json_format.pyc
 ${PYSITELIB}/google/protobuf/json_format.pyo
@@ -251,39 +149,6 @@ ${PYSITELIB}/google/protobuf/timestamp_pb2.pyo
 ${PYSITELIB}/google/protobuf/type_pb2.py
 ${PYSITELIB}/google/protobuf/type_pb2.pyc
 ${PYSITELIB}/google/protobuf/type_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_arena_pb2.py
-${PYSITELIB}/google/protobuf/unittest_arena_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_arena_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_custom_options_pb2.py
-${PYSITELIB}/google/protobuf/unittest_custom_options_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_custom_options_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_import_pb2.py
-${PYSITELIB}/google/protobuf/unittest_import_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_import_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_import_public_pb2.py
-${PYSITELIB}/google/protobuf/unittest_import_public_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_import_public_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_mset_pb2.py
-${PYSITELIB}/google/protobuf/unittest_mset_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_mset_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_mset_wire_format_pb2.py
-${PYSITELIB}/google/protobuf/unittest_mset_wire_format_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_mset_wire_format_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_no_arena_import_pb2.py
-${PYSITELIB}/google/protobuf/unittest_no_arena_import_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_no_arena_import_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_no_arena_pb2.py
-${PYSITELIB}/google/protobuf/unittest_no_arena_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_no_arena_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_no_generic_services_pb2.py
-${PYSITELIB}/google/protobuf/unittest_no_generic_services_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_no_generic_services_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_pb2.py
-${PYSITELIB}/google/protobuf/unittest_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_proto3_arena_pb2.py
-${PYSITELIB}/google/protobuf/unittest_proto3_arena_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_proto3_arena_pb2.pyo
 ${PYSITELIB}/google/protobuf/util/__init__.py
 ${PYSITELIB}/google/protobuf/util/__init__.pyc
 ${PYSITELIB}/google/protobuf/util/__init__.pyo
diff --git a/devel/py-protobuf/distinfo b/devel/py-protobuf/distinfo
index 892fc48df5b..6dda90bfce5 100644
--- a/devel/py-protobuf/distinfo
+++ b/devel/py-protobuf/distinfo
@@ -1,17 +1,6 @@
-$NetBSD: distinfo,v 1.15 2019/01/06 11:21:06 markd Exp $
+$NetBSD: distinfo,v 1.16 2019/03/21 21:29:08 adam Exp $
 
-SHA1 (protobuf-python-3.6.1.tar.gz) = 9170df4cde3ddb94bae7247d209e1cda4432967b
-RMD160 (protobuf-python-3.6.1.tar.gz) = ee9f8344a688f636cee409227b36a5161fa88c44
-SHA512 (protobuf-python-3.6.1.tar.gz) = 9cf80401fca3b58d41c7aa95988bf3763680c5a82009b90f85671762641c7a5a7fd1af691ab258d57fa43f790a9162fdfd96f29f63e888626083b2abe84bafff
-Size (protobuf-python-3.6.1.tar.gz) = 4748789 bytes
-SHA1 (patch-configure) = a35883ff62ba1db429a6cbc12b75714e78e28abf
-SHA1 (patch-configure.ac) = 208a5ce72905aa95ad73ee0f751d4a58f0c37f5f
-SHA1 (patch-m4_acx__check__suncc.m4) = faf96ee5d305c08d30e7c7d3578896971983e1dd
-SHA1 (patch-python_google_protobuf_pyext_descriptor.cc) = 32f3ddb90d3b52dd4b6919ec75047dcd2906a218
-SHA1 (patch-python_google_protobuf_pyext_descriptor_containers.cc) = 6aed9e2a5b5803fdecaf0d5a49a48ef219b5ca1f
-SHA1 (patch-python_google_protobuf_pyext_descriptor_pool.cc) = 9fe51dfd39f1e3af202a4cff586947b4ec8475a5
-SHA1 (patch-python_google_protobuf_pyext_extension_dict.cc) = 6fff247e007e7856442480600f98507712c80c69
-SHA1 (patch-python_google_protobuf_pyext_message.cc) = 30faea1052e097d976430e2224c97e98cadb5e75
-SHA1 (patch-src_google_protobuf_message__lite.cc) = 8f2ffe07b2710de5365148153978ad6d9939f522
-SHA1 (patch-third__party_googletest_googlemock_configure) = fe3b812e819130d87d99316144507d2454461cd1
-SHA1 (patch-third__party_googletest_googlemock_configure.ac) = dc06fc7aebaef02df536458e45f77386cc857261
+SHA1 (protobuf-3.7.0.tar.gz) = c3250d0cc74fadeffdbb0a01f0fe1512f923ef99
+RMD160 (protobuf-3.7.0.tar.gz) = 02a3188d33bb62463b2e6b5f85dfd50915142e33
+SHA512 (protobuf-3.7.0.tar.gz) = 03ab744215694eaa4bfe40ab0b3ebd39065ac865a7dd48c1b2c038c21a091a2f4ea02f8c21b888f96d0454f01e6fa5e5e0026c9cb5643e7df490a7cbedf98c6f
+Size (protobuf-3.7.0.tar.gz) = 255287 bytes
diff --git a/devel/py-protobuf/patches/patch-configure b/devel/py-protobuf/patches/patch-configure
deleted file mode 100644
index 3150828de6b..00000000000
--- a/devel/py-protobuf/patches/patch-configure
+++ /dev/null
@@ -1,183 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2019/01/08 05:56:19 markd Exp $
-
-Fix unportable test(1) operator.
-
---- configure.orig	2018-06-06 19:44:06.000000000 +0000
-+++ configure
-@@ -787,7 +787,6 @@ infodir
- docdir
- oldincludedir
- includedir
--runstatedir
- localstatedir
- sharedstatedir
- sysconfdir
-@@ -882,7 +881,6 @@ datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--runstatedir='${localstatedir}/run'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-@@ -1135,15 +1133,6 @@ do
-   | -silent | --silent | --silen | --sile | --sil)
-     silent=yes ;;
- 
--  -runstatedir | --runstatedir | --runstatedi | --runstated \
--  | --runstate | --runstat | --runsta | --runst | --runs \
--  | --run | --ru | --r)
--    ac_prev=runstatedir ;;
--  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
--  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
--  | --run=* | --ru=* | --r=*)
--    runstatedir=$ac_optarg ;;
--
-   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-     ac_prev=sbindir ;;
-   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-@@ -1281,7 +1270,7 @@ fi
- for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
- 		datadir sysconfdir sharedstatedir localstatedir includedir \
- 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
--		libdir localedir mandir runstatedir
-+		libdir localedir mandir
- do
-   eval ac_val=\$$ac_var
-   # Remove trailing slashes.
-@@ -1434,7 +1423,6 @@ Fine tuning of the installation director
-   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
--  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-   --libdir=DIR            object code libraries [EPREFIX/lib]
-   --includedir=DIR        C header files [PREFIX/include]
-   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-@@ -7600,7 +7588,7 @@ fi
- fi
- 
-   case $host_os in
--    *solaris*)
-+    *notsolaris*)
-       for ac_prog in isainfo
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -8796,7 +8784,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd* | netbsdelf*-gnu)
-+netbsd*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   else
-@@ -12231,9 +12219,6 @@ $as_echo_n "checking whether the $compil
-   openbsd* | bitrig*)
-     with_gnu_ld=no
-     ;;
--  linux* | k*bsd*-gnu | gnu*)
--    link_all_deplibs=no
--    ;;
-   esac
- 
-   ld_shlibs=yes
-@@ -12488,7 +12473,7 @@ _LT_EOF
-       fi
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
-+    netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -13158,7 +13143,6 @@ $as_echo "$lt_cv_irix_exported_symbol" >
- 	if test yes = "$lt_cv_irix_exported_symbol"; then
-           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
- 	fi
--	link_all_deplibs=no
-       else
- 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
- 	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
-@@ -13180,7 +13164,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
-       esac
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
-+    netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -14295,18 +14279,6 @@ fi
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--netbsdelf*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='NetBSD ld.elf_so'
--  ;;
--
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -17201,7 +17173,7 @@ lt_prog_compiler_static_CXX=
- 	    ;;
- 	esac
- 	;;
--      netbsd* | netbsdelf*-gnu)
-+      netbsd*)
- 	;;
-       *qnx* | *nto*)
-         # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -17576,9 +17548,6 @@ $as_echo_n "checking whether the $compil
-       ;;
-     esac
-     ;;
--  linux* | k*bsd*-gnu | gnu*)
--    link_all_deplibs_CXX=no
--    ;;
-   *)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-     ;;
-@@ -18272,18 +18241,6 @@ fi
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--netbsdelf*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='NetBSD ld.elf_so'
--  ;;
--
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -18661,7 +18618,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
-- if test "$have_ld_version_script" == "yes"; then
-+ if test "$have_ld_version_script" = "yes"; then
-   HAVE_LD_VERSION_SCRIPT_TRUE=
-   HAVE_LD_VERSION_SCRIPT_FALSE='#'
- else
-@@ -22590,6 +22549,7 @@ $as_echo X"$file" |
-     cat <<_LT_EOF >> "$cfgfile"
- #! $SHELL
- # Generated automatically by $as_me ($PACKAGE) $VERSION
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- 
- # Provide generalized library-building support services.
diff --git a/devel/py-protobuf/patches/patch-configure.ac b/devel/py-protobuf/patches/patch-configure.ac
deleted file mode 100644
index f928490bb5b..00000000000
--- a/devel/py-protobuf/patches/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2019/01/08 05:56:19 markd Exp $
-
-Fix unportable test(1) operator.
-
---- configure.ac.orig	2017-04-06 00:15:19.000000000 +0000
-+++ configure.ac
-@@ -110,7 +110,7 @@ AC_LINK_IFELSE(
-   [have_ld_version_script=yes; AC_MSG_RESULT(yes)],
-   [have_ld_version_script=no; AC_MSG_RESULT(no)])
- LDFLAGS=$save_LDFLAGS
--AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], [test "$have_ld_version_script" == "yes"])
-+AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], [test "$have_ld_version_script" = "yes"])
- 
- # Checks for header files.
- AC_HEADER_STDC
diff --git a/devel/py-protobuf/patches/patch-m4_acx__check__suncc.m4 b/devel/py-protobuf/patches/patch-m4_acx__check__suncc.m4
deleted file mode 100644
index 27b7f80a2f0..00000000000
--- a/devel/py-protobuf/patches/patch-m4_acx__check__suncc.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-m4_acx__check__suncc.m4,v 1.1 2019/01/08 05:56:19 markd Exp $
-
-Disable Solaris ISA selection.
-
---- m4/acx_check_suncc.m4.orig	2017-03-29 20:41:23.000000000 +0000
-+++ m4/acx_check_suncc.m4
-@@ -30,7 +30,7 @@ AC_DEFUN([ACX_CHECK_SUNCC],[
-   ])
- 
-   case $host_os in
--    *solaris*)
-+    *notsolaris*)
-       AC_CHECK_PROGS(ISAINFO, [isainfo], [no])
-       AS_IF([test "x$ISAINFO" != "xno"],
-             [isainfo_b=`${ISAINFO} -b`],
diff --git a/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor.cc b/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor.cc
deleted file mode 100644
index 58ecc960ace..00000000000
--- a/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-python_google_protobuf_pyext_descriptor.cc,v 1.1 2019/01/08 05:56:19 markd Exp $
-
-python3.7 fixes
-
---- python/google/protobuf/pyext/descriptor.cc.orig	2018-07-30 22:16:10.000000000 +0000
-+++ python/google/protobuf/pyext/descriptor.cc
-@@ -56,7 +56,7 @@
-   #endif
-   #define PyString_AsStringAndSize(ob, charpp, sizep) \
-     (PyUnicode_Check(ob)? \
--       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
-+       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
-        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
- #endif
- 
diff --git a/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor_containers.cc b/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor_containers.cc
deleted file mode 100644
index 4d28158b94f..00000000000
--- a/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor_containers.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-python_google_protobuf_pyext_descriptor_containers.cc,v 1.1 2019/01/08 05:56:19 markd Exp $
-
-python3.7 fixes 
-
---- python/google/protobuf/pyext/descriptor_containers.cc.orig	2018-07-30 22:16:10.000000000 +0000
-+++ python/google/protobuf/pyext/descriptor_containers.cc
-@@ -66,7 +66,7 @@
-   #endif
-   #define PyString_AsStringAndSize(ob, charpp, sizep) \
-     (PyUnicode_Check(ob)? \
--       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
-+       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
-        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
- #endif
- 
diff --git a/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor_pool.cc b/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor_pool.cc
deleted file mode 100644
index 218f537e2ed..00000000000
--- a/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor_pool.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-python_google_protobuf_pyext_descriptor_pool.cc,v 1.1 2019/01/08 05:56:19 markd Exp $
-
-python3.7 fixes 
-
---- python/google/protobuf/pyext/descriptor_pool.cc.orig	2018-07-30 22:16:10.000000000 +0000
-+++ python/google/protobuf/pyext/descriptor_pool.cc
-@@ -48,7 +48,7 @@
-   #endif
-   #define PyString_AsStringAndSize(ob, charpp, sizep) \
-     (PyUnicode_Check(ob)? \
--       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
-+       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
-        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
- #endif
- 
diff --git a/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_extension_dict.cc b/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_extension_dict.cc
deleted file mode 100644
index 9a823cc4fa2..00000000000
--- a/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_extension_dict.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-python_google_protobuf_pyext_extension_dict.cc,v 1.1 2019/01/08 05:56:19 markd Exp $
-
-python3.7 fixes 
-
---- python/google/protobuf/pyext/extension_dict.cc.orig	2018-07-30 22:16:10.000000000 +0000
-+++ python/google/protobuf/pyext/extension_dict.cc
-@@ -53,7 +53,7 @@
-   #endif
-   #define PyString_AsStringAndSize(ob, charpp, sizep) \
-     (PyUnicode_Check(ob)? \
--       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
-+       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
-        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
- #endif
- 
diff --git a/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_message.cc b/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_message.cc
deleted file mode 100644
index 95f023bc049..00000000000
--- a/devel/py-protobuf/patches/patch-python_google_protobuf_pyext_message.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-python_google_protobuf_pyext_message.cc,v 1.1 2019/01/08 05:56:19 markd Exp $
-
---- python/google/protobuf/pyext/message.cc.orig	2018-07-30 22:16:10.000000000 +0000
-+++ python/google/protobuf/pyext/message.cc
-@@ -79,7 +79,7 @@
-     (PyUnicode_Check(ob)? PyUnicode_AsUTF8(ob): PyBytes_AsString(ob))
-   #define PyString_AsStringAndSize(ob, charpp, sizep) \
-     (PyUnicode_Check(ob)? \
--       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
-+       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
-        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
-   #endif
- #endif
-@@ -1529,7 +1529,7 @@ PyObject* HasField(CMessage* self, PyObj
-     return NULL;
-   }
- #else
--  field_name = PyUnicode_AsUTF8AndSize(arg, &size);
-+  field_name = const_cast<char*>(PyUnicode_AsUTF8AndSize(arg, &size));
-   if (!field_name) {
-     return NULL;
-   }
diff --git a/devel/py-protobuf/patches/patch-src_google_protobuf_message__lite.cc b/devel/py-protobuf/patches/patch-src_google_protobuf_message__lite.cc
deleted file mode 100644
index 7dc286416c5..00000000000
--- a/devel/py-protobuf/patches/patch-src_google_protobuf_message__lite.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_google_protobuf_message__lite.cc,v 1.1 2019/01/08 05:56:19 markd Exp $
-
-need limits for INT_MAX
-
---- src/google/protobuf/message_lite.cc.orig	2016-09-24 01:27:21.000000000 +0000
-+++ src/google/protobuf/message_lite.cc
-@@ -38,6 +38,7 @@
- #include <google/protobuf/message_lite.h>
- #include <google/protobuf/repeated_field.h>
- #include <string>
-+#include <climits>
- #include <google/protobuf/stubs/logging.h>
- #include <google/protobuf/stubs/common.h>
- #include <google/protobuf/io/coded_stream.h>
diff --git a/devel/py-protobuf/patches/patch-third__party_googletest_googlemock_configure b/devel/py-protobuf/patches/patch-third__party_googletest_googlemock_configure
deleted file mode 100644
index 4ff5e61dbad..00000000000
--- a/devel/py-protobuf/patches/patch-third__party_googletest_googlemock_configure
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-third__party_googletest_googlemock_configure,v 1.1 2019/01/08 05:56:19 markd Exp $
-
-Fix shell portability issues.
-
---- third_party/googletest/googlemock/configure.orig	2018-07-31 00:19:25.000000000 +0000
-+++ third_party/googletest/googlemock/configure
-@@ -16355,7 +16355,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
-        have_pthreads="$acx_pthread_ok"
- fi
-- if test "x$have_pthreads" == "xyes"; then
-+ if test "x$have_pthreads" = "xyes"; then
-   HAVE_PTHREADS_TRUE=
-   HAVE_PTHREADS_FALSE='#'
- else
-@@ -16385,7 +16385,7 @@ else
-   enable_external_gtest=yes
- fi
- 
--if test "x$with_gtest" == "xno"; then :
-+if test "x$with_gtest" = "xno"; then :
-   as_fn_error $? "Support for GoogleTest was explicitly disabled. Currently GoogleMock has a hard
- dependency upon GoogleTest to build, please provide a version, or allow
- GoogleMock to use any installed version and fall back upon its internal
diff --git a/devel/py-protobuf/patches/patch-third__party_googletest_googlemock_configure.ac b/devel/py-protobuf/patches/patch-third__party_googletest_googlemock_configure.ac
deleted file mode 100644
index 0ebe6524df8..00000000000
--- a/devel/py-protobuf/patches/patch-third__party_googletest_googlemock_configure.ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-third__party_googletest_googlemock_configure.ac,v 1.1 2019/01/08 05:56:19 markd Exp $
-
-Fix shell portability issues.
-
---- third_party/googletest/googlemock/configure.ac.orig	2018-05-17 17:42:54.000000000 +0000
-+++ third_party/googletest/googlemock/configure.ac
-@@ -52,7 +52,7 @@ AS_IF([test "x$with_pthreads" != "xno"],
-                [AC_MSG_FAILURE(
-                  [--with-pthreads was specified, but unable to be used])])])
-        have_pthreads="$acx_pthread_ok"])
--AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" == "xyes"])
-+AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" = "xyes"])
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
- 
-@@ -76,7 +76,7 @@ AC_ARG_ENABLE([external-gtest],
-                               installed or user provided gtest. Any option to
-                               '--with-gtest' is ignored. (Default is enabled.)])
-               ], [], [enable_external_gtest=yes])
--AS_IF([test "x$with_gtest" == "xno"],
-+AS_IF([test "x$with_gtest" = "xno"],
-       [AC_MSG_ERROR([dnl
- Support for GoogleTest was explicitly disabled. Currently GoogleMock has a hard
- dependency upon GoogleTest to build, please provide a version, or allow