Update net/mitmproxy to 0.16.

Changes:
v0.16
-----
  * Completely revised HTTP2 implementation based on hyper-h2 (Thomas
    Kriechbaumer)
  * Export flows as cURL command, Python code or raw HTTP (Shadab Zafar)
  * Fixed compatibility with the Android Emulator (Will Coster)
  * Script Reloader: Inline scripts are reloaded automatically if modified
    (Matthew Shao)
  * Inline script hooks for TCP mode (Michael J. Bazzinotti)
  * Add default ciphers to support iOS9 App Transport Security (Jorge
    Villacorta)
  * Basic Authentication for mitmweb (Guillem Anguera)
  * Exempt connections from interception based on TLS Server Name Indication
    (David Weinstein)
  * Provide Python Wheels for faster installation
  * Numerous bugfixes and minor improvements

4 files changed, 109 insertions, 64 deletions

diff --git a/net/mitmproxy/Makefile b/net/mitmproxy/Makefile
index ca8ab272dcf..35759d19bff 100644
--- a/net/mitmproxy/Makefile
+++ b/net/mitmproxy/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2016/02/11 11:07:58 leot Exp $
+# $NetBSD: Makefile,v 1.10 2016/02/16 13:54:00 leot Exp $
 
-DISTNAME=	mitmproxy-0.15
-PKGREVISION=	1
+DISTNAME=	mitmproxy-0.16
 CATEGORIES=	net
 MASTER_SITES=	http://mitmproxy.org/download/
 
@@ -10,24 +9,25 @@ HOMEPAGE=	http://mitmproxy.org/
 COMMENT=	Interactive console program for inspecting and editing traffic flows
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-Pillow>=3.0.0:../../graphics/py-Pillow
+DEPENDS+=	${PYPKGPREFIX}-Pillow>=3.1:../../graphics/py-Pillow
 DEPENDS+=	${PYPKGPREFIX}-blinker>=1.4:../../devel/py-blinker
 DEPENDS+=	${PYPKGPREFIX}-certifi>=2015.9.6.2:../../security/py-certifi
 DEPENDS+=	${PYPKGPREFIX}-click>=6.2:../../devel/py-click
 DEPENDS+=	${PYPKGPREFIX}-configargparse>=0.10.0:../../devel/py-configargparse
 DEPENDS+=	${PYPKGPREFIX}-construct>=2.5.2:../../devel/py-construct
-DEPENDS+=	${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34
+DEPENDS+=	${PYPKGPREFIX}-enum34>=1.0.4:../../devel/py-enum34
+DEPENDS+=	${PYPKGPREFIX}-h2>=2.1.0:../../www/py-h2
 DEPENDS+=	${PYPKGPREFIX}-html2text>=2015.11.4:../../textproc/py-html2text
-DEPENDS+=	${PYPKGPREFIX}-lxml>=3.4.4:../../textproc/py-lxml
+DEPENDS+=	${PYPKGPREFIX}-lxml>=3.5.0:../../textproc/py-lxml
 DEPENDS+=	${PYPKGPREFIX}-netlib>=0.15:../../net/py-netlib
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.5:../../devel/py-pyparsing
+DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.1:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-pyperclip>=1.5.22:../../x11/py-pyperclip
-DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-six>=1.10:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-tornado>=4.3.0:../../www/py-tornado
 DEPENDS+=	${PYPKGPREFIX}-urwid>=1.3.1:../../devel/py-urwid
 DEPENDS+=	${PYPKGPREFIX}-watchdog>=0.8.3:../../sysutils/py-watchdog
 
-USE_LANGUAGES=	# none
+USE_LANGUAGES=			# none
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # py-netlib
 
 REPLACE_PYTHON=	libmproxy/contrib/*.py libmproxy/contrib/wbxml/*.py
diff --git a/net/mitmproxy/PLIST b/net/mitmproxy/PLIST
index c3bfb5fac3c..f7baec696bc 100644
--- a/net/mitmproxy/PLIST
+++ b/net/mitmproxy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/12/30 15:08:08 leot Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/02/16 13:54:00 leot Exp $
 bin/mitmdump
 bin/mitmproxy
 bin/mitmweb
@@ -133,6 +133,9 @@ ${PYSITELIB}/libmproxy/filt.pyo
 ${PYSITELIB}/libmproxy/flow.py
 ${PYSITELIB}/libmproxy/flow.pyc
 ${PYSITELIB}/libmproxy/flow.pyo
+${PYSITELIB}/libmproxy/flow_export.py
+${PYSITELIB}/libmproxy/flow_export.pyc
+${PYSITELIB}/libmproxy/flow_export.pyo
 ${PYSITELIB}/libmproxy/flow_format_compat.py
 ${PYSITELIB}/libmproxy/flow_format_compat.pyc
 ${PYSITELIB}/libmproxy/flow_format_compat.pyo
@@ -193,6 +196,12 @@ ${PYSITELIB}/libmproxy/protocol/base.pyo
 ${PYSITELIB}/libmproxy/protocol/http.py
 ${PYSITELIB}/libmproxy/protocol/http.pyc
 ${PYSITELIB}/libmproxy/protocol/http.pyo
+${PYSITELIB}/libmproxy/protocol/http1.py
+${PYSITELIB}/libmproxy/protocol/http1.pyc
+${PYSITELIB}/libmproxy/protocol/http1.pyo
+${PYSITELIB}/libmproxy/protocol/http2.py
+${PYSITELIB}/libmproxy/protocol/http2.pyc
+${PYSITELIB}/libmproxy/protocol/http2.pyo
 ${PYSITELIB}/libmproxy/protocol/http_replay.py
 ${PYSITELIB}/libmproxy/protocol/http_replay.pyc
 ${PYSITELIB}/libmproxy/protocol/http_replay.pyo
diff --git a/net/mitmproxy/distinfo b/net/mitmproxy/distinfo
index f3560d41af3..1ee5b0538c3 100644
--- a/net/mitmproxy/distinfo
+++ b/net/mitmproxy/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2016/02/11 11:07:58 leot Exp $
+$NetBSD: distinfo,v 1.8 2016/02/16 13:54:00 leot Exp $
 
-SHA1 (mitmproxy-0.15.tar.gz) = c26793c8ac957f8a4d75073ca22edc4ebdaf158e
-RMD160 (mitmproxy-0.15.tar.gz) = de16080adb8d218c21d62577afb9bcb14e265bd1
-SHA512 (mitmproxy-0.15.tar.gz) = 3130e82965fd12379ddc2ca0369900a668a6bf68b122781fc8e84079d2ebad0d3e3d7b553b397100cf40872f33ce0014edebed5b056602c30df51c9084014ce7
-Size (mitmproxy-0.15.tar.gz) = 1503247 bytes
-SHA1 (patch-setup.py) = 957ab39809084e7a1b1f0e1d63f14785d71f1a4a
+SHA1 (mitmproxy-0.16.tar.gz) = ca625a9daf65545c81039e91dd2bee367fced862
+RMD160 (mitmproxy-0.16.tar.gz) = 6fd3c16c4b2d78b746c03331639de477aa1383a6
+SHA512 (mitmproxy-0.16.tar.gz) = ee25190d23f3a9f5926d670b8af1dcf03e7aba89a52d909563e0803f25fe9bce334a51011119b23ea1fdaa19181b02a84448a0a96f571b0d93a45477f58650ab
+Size (mitmproxy-0.16.tar.gz) = 26439489 bytes
+SHA1 (patch-setup.py) = 490c81bc89c9bbb243927e5d5db5761bb897d0c6
diff --git a/net/mitmproxy/patches/patch-setup.py b/net/mitmproxy/patches/patch-setup.py
index 59c4df0059b..b6e447aa648 100644
--- a/net/mitmproxy/patches/patch-setup.py
+++ b/net/mitmproxy/patches/patch-setup.py
@@ -1,54 +1,90 @@
-$NetBSD: patch-setup.py,v 1.2 2016/02/11 11:07:58 leot Exp $
+$NetBSD: patch-setup.py,v 1.3 2016/02/16 13:54:00 leot Exp $
 
 Avoid too strict version requirements.
 
---- setup.py.orig	2015-12-03 17:16:16.000000000 +0000
+--- setup.py.orig	2016-02-14 16:04:47.000000000 +0000
 +++ setup.py
-@@ -15,25 +15,25 @@ with open(os.path.join(here, 'README.rst
- # Core dependencies
- deps = {
-     "netlib>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION),
--    "tornado>=4.3.0, <4.4",
--    "configargparse>=0.10.0, <0.11",
--    "pyperclip>=1.5.22, <1.6",
--    "blinker>=1.4, <1.5",
--    "pyparsing>=2.0.5, <2.1",
--    "html2text==2015.11.4",
--    "construct>=2.5.2, <2.6",
--    "six>=1.10.0, <1.11",
--    "lxml==3.4.4",  # there are no Windows wheels for 3.5!
--    "Pillow>=3.0.0, <3.1",
--    "watchdog>=0.8.3, <0.9",
-+    "tornado>=4.3.0",
-+    "configargparse>=0.10.0",
-+    "pyperclip>=1.5.22",
-+    "blinker>=1.4",
-+    "pyparsing>=2.0.5",
-+    "html2text>=2015.11.4",
-+    "construct>=2.5.2",
-+    "six>=1.10.0",
-+    "lxml>=3.4.4",  # there are no Windows wheels for 3.5!
-+    "Pillow>=3.0.0",
-+    "watchdog>=0.8.3",
- }
- # A script -> additional dependencies dict.
- scripts = {
-     "mitmproxy": {
+@@ -51,19 +51,19 @@ setup(
+     # It is not considered best practice to use install_requires to pin dependencies to specific versions.
+     install_requires=[
+         "netlib>={}, <{}".format(version.MINORVERSION, version.NEXT_MINORVERSION),
+-        "h2>=2.1.0, <2.2",
+-        "tornado>=4.3, <4.4",
+-        "configargparse>=0.10, <0.11",
+-        "pyperclip>=1.5.22, <1.6",
+-        "blinker>=1.4, <1.5",
+-        "pyparsing>=2.1,<2.2",
+-        "html2text==2016.1.8",
+-        "construct>=2.5.2, <2.6",
+-        "six>=1.10, <1.11",
+-        "Pillow>=3.1, <3.2",
+-        "watchdog>=0.8.3, <0.9",
+-        "click>=6.2, <7.0",
 -        "urwid>=1.3.1, <1.4",
-+        "urwid>=1.3.1",
-     },
-     "mitmdump": {
--        "click>=6.2, <6.3",
++        "h2>=2.1.0",
++        "tornado>=4.3",
++        "configargparse>=0.10",
++        "pyperclip>=1.5.22",
++        "blinker>=1.4",
++        "pyparsing>=2.1",
++        "html2text>=2016.1.8",
++        "construct>=2.5.2",
++        "six>=1.10",
++        "Pillow>=3.1",
++        "watchdog>=0.8.3",
 +        "click>=6.2",
-     },
-     "mitmweb": set()
- }
-@@ -68,7 +68,7 @@ for script_deps in scripts.values():
-     deps.update(script_deps)
- 
- if sys.version_info < (3, 4):
--    example_deps.add("enum34>=1.0.4, <1.1")
-+    example_deps.add("enum34>=1.0.4")
- 
- console_scripts = ["%s = libmproxy.main:%s" % (s, s) for s in scripts.keys()]
- 
++        "urwid>=1.3.1",
+     ],
+     extras_require={
+         ':sys_platform == "win32"': [
+@@ -71,34 +71,34 @@ setup(
+             "lxml==3.4.4",  # there are no Windows wheels for newer versions, so we pin this.
+         ],
+         ':sys_platform != "win32"': [
+-            "lxml>=3.5.0, <3.6",
++            "lxml>=3.5.0",
+         ],
+         # Do not use a range operator here: https://bitbucket.org/pypa/setuptools/issues/380
+         # Ubuntu Trusty and other still ship with setuptools < 17.1
+         ':python_version == "2.7"': [
+-            "enum34>=1.0.4, <1.2",
++            "enum34>=1.0.4",
+         ],
+         'dev': [
+-            "mock>=1.3.0, <1.4",
+-            "pytest>=2.8.7, <2.9",
+-            "pytest-xdist>=1.14, <1.15",
+-            "pytest-cov>=2.2.1, <2.3",
+-            "pytest-timeout>=1.0.0, <1.1",
+-            "coveralls>=1.1, <1.2",
++            "mock>=1.3.0",
++            "pytest>=2.8.7",
++            "pytest-xdist>=1.14",
++            "pytest-cov>=2.2.1",
++            "pytest-timeout>=1.0.0",
++            "coveralls>=1.1",
+             "pathod>={}, <{}".format(version.MINORVERSION, version.NEXT_MINORVERSION),
+-            "sphinx>=1.3.5, <1.4",
+-            "sphinx-autobuild>=0.5.2, <0.6",
+-            "sphinxcontrib-documentedlist>=0.3.0, <0.4"
++            "sphinx>=1.3.5",
++            "sphinx-autobuild>=0.5.2",
++            "sphinxcontrib-documentedlist>=0.3.0",
+         ],
+         'contentviews': [
+-            "pyamf>=0.8.0, <0.9",
+-            "protobuf>=2.6.1, <2.7",
+-            "cssutils>=1.0.1, <1.1"
++            "pyamf>=0.8.0",
++            "protobuf>=2.6.1",
++            "cssutils>=1.0.1",
+         ],
+         'examples': [
+             "pytz==2015.7.0",
+-            "harparser>=0.2, <0.3",
+-            "beautifulsoup4>=4.4.1, <4.5",
++            "harparser>=0.2",
++            "beautifulsoup4>=4.4.1",
+         ]
+     }
+ )