Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/mitmproxy/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile	9 Jul 2016 13:03:59 -0000	1.13
+++ Makefile	17 Oct 2016 10:49:45 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.13 2016/07/09 13:03:59 wiz Exp $
 
-DISTNAME=	mitmproxy-0.17
+DISTNAME=	mitmproxy-0.18.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mitmproxy/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -15,11 +15,13 @@ DEPENDS+=	${PYPKGPREFIX}-Pillow>=3.2:../
 DEPENDS+=	${PYPKGPREFIX}-asn1>=0.1.9:../../security/py-asn1
 DEPENDS+=	${PYPKGPREFIX}-backports.ssl_match_hostname>=3.5.0.1:../../security/py-backports.ssl_match_hostname
 DEPENDS+=	${PYPKGPREFIX}-blinker>=1.4:../../devel/py-blinker
+#DEPENDS+=	${PYPKGPREFIX}-brotlipy>=0.5.1:../../archivers/py-brotlipy # TODO
 DEPENDS+=	${PYPKGPREFIX}-certifi>=2015.11.20.1:../../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}-cryptography>=1.3:../../security/py-cryptography
+#DEPENDS+=	${PYPKGPREFIX}-cssutils>=1.0.1:../../textproc/py-cssutils # TODO: update
 DEPENDS+=	${PYPKGPREFIX}-enum34>=1.0.4:../../devel/py-enum34
 DEPENDS+=	${PYPKGPREFIX}-flask>=0.10.1:../../www/py-flask
 DEPENDS+=	${PYPKGPREFIX}-h2>=2.1.2:../../www/py-h2
@@ -27,10 +29,12 @@ DEPENDS+=	${PYPKGPREFIX}-hpack>=2.1.0:..
 DEPENDS+=	${PYPKGPREFIX}-html2text>=2016.1.8:../../textproc/py-html2text
 DEPENDS+=	${PYPKGPREFIX}-hyperframe>=3.2.0:../../www/py-hyperframe
 DEPENDS+=	${PYPKGPREFIX}-ipaddress>=1.0.15:../../net/py-ipaddress
+#DEPENDS+=	${PYPKGPREFIX}-jsbeautifier>=1.6.3:../../local/py-jsbeautifier # TODO
 DEPENDS+=	${PYPKGPREFIX}-lxml>=3.5.0:../../textproc/py-lxml
 DEPENDS+=	${PYPKGPREFIX}-passlib>=1.6.5:../../security/py-passlib
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.1:../../devel/py-pyparsing
+DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.1.3:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-pyperclip>=1.5.22:../../x11/py-pyperclip
+DEPENDS+=	${PYPKGPREFIX}-requests>=2.9.1:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-tornado>=4.3.0:../../www/py-tornado
 DEPENDS+=	${PYPKGPREFIX}-urwid>=1.3.1:../../devel/py-urwid
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/mitmproxy/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo	21 Apr 2016 08:20:45 -0000	1.9
+++ distinfo	17 Oct 2016 10:49:45 -0000
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.9 2016/04/21 08:20:45 leot Exp $
 
-SHA1 (mitmproxy-0.17.tar.gz) = e6bec7da5e4b8ce81a879125d8db609fae77a068
-RMD160 (mitmproxy-0.17.tar.gz) = a1e13087fd26e0f7e35890fea7ceddec8d9aeb94
-SHA512 (mitmproxy-0.17.tar.gz) = 10358a335feb9a88d351f1623b4894c24e2c73f8a76d796191324e3b2b00bd8d8d64e26dc7c982b63136358c008b571a7fe2a713f427e54b297091d781a9497b
-Size (mitmproxy-0.17.tar.gz) = 26915176 bytes
-SHA1 (patch-setup.py) = 8219fee4c30ac0a8bb52a6c34ae6657bf59885cc
+SHA1 (mitmproxy-0.18.1.tar.gz) = f7e41d6afc1d13cf253581a685f874e9a06a2908
+RMD160 (mitmproxy-0.18.1.tar.gz) = f9332aafd297fbc1b51e635bbcf57a72e27a4e23
+SHA512 (mitmproxy-0.18.1.tar.gz) = cb77ef7580f0f1b8a0b7c80d8a8ed7dfe2a5d57263a80228c5a9cc93cdc83319d83b8cbaddb4c1e96c48a24764b11c4a0c61b7fdb3362da17ba6a1d31a4cd221
+Size (mitmproxy-0.18.1.tar.gz) = 26614838 bytes
+SHA1 (patch-setup.py) = f8b703a7e193a7174e5e1886920bf893606502c1
Index: patches/patch-setup.py
===================================================================
RCS file: /cvsroot/pkgsrc/net/mitmproxy/patches/patch-setup.py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-setup.py
--- patches/patch-setup.py	21 Apr 2016 08:20:45 -0000	1.4
+++ patches/patch-setup.py	17 Oct 2016 10:49:45 -0000
@@ -2,9 +2,9 @@ $NetBSD: patch-setup.py,v 1.4 2016/04/21
 
 Avoid too strict version requirements.
 
---- setup.py.orig	2016-04-10 00:43:47.000000000 +0000
+--- setup.py.orig	2016-10-16 10:52:47.000000000 +0000
 +++ setup.py
-@@ -59,64 +59,64 @@ setup(
+@@ -60,67 +60,67 @@ setup(
      # https://packaging.python.org/en/latest/requirements/#install-requires
      # It is not considered best practice to use install_requires to pin dependencies to specific versions.
      install_requires=[
@@ -15,46 +15,50 @@ Avoid too strict version requirements.
 +        "blinker>=1.4",
 +        "click>=6.2",
          "certifi>=2015.11.20.1",  # no semver here - this should always be on the last release!
--        "configargparse>=0.10, <0.11",
+-        "configargparse>=0.10, <0.12",
 -        "construct>=2.5.2, <2.6",
--        "cryptography>=1.3,<1.4",
--        "Flask>=0.10.1, <0.11",
--        "h2>=2.1.2, <3.0",
--        "hpack>=2.1.0, <3.0",
--        "html2text>=2016.1.8, <=2016.4.2",
--        "hyperframe>=3.2.0, <4.0",
--        "lxml>=3.5.0, <3.7",
--        "Pillow>=3.2, <3.3",
+-        "cryptography>=1.3, <1.6",
+-        "cssutils>=1.0.1, <1.1",
+-        "Flask>=0.10.1, <0.12",
+-        "h2>=2.4.1, <3",
+-        "html2text>=2016.1.8, <=2016.9.19",
+-        "hyperframe>=4.0.1, <5",
+-        "jsbeautifier>=1.6.3, <1.7",
+-        "lxml>=3.5.0, <=3.6.0",  # no wheels for 3.6.1 yet.
+-        "Pillow>=3.2, <3.5",
 -        "passlib>=1.6.5, <1.7",
 -        "pyasn1>=0.1.9, <0.2",
 -        "pyOpenSSL>=16.0, <17.0",
--        "pyparsing>=2.1,<2.2",
+-        "pyparsing>=2.1.3, <2.2",
 -        "pyperclip>=1.5.22, <1.6",
--        "requests>=2.9.1, <2.10",
+-        "requests>=2.9.1, <2.12",
 -        "six>=1.10, <1.11",
--        "tornado>=4.3, <4.4",
+-        "tornado>=4.3, <4.5",
 -        "urwid>=1.3.1, <1.4",
 -        "watchdog>=0.8.3, <0.9",
+-        "brotlipy>=0.5.1, <0.7",
 +        "configargparse>=0.10",
 +        "construct>=2.5.2",
 +        "cryptography>=1.3",
++        "cssutils>=1.0.1",
 +        "Flask>=0.10.1",
-+        "h2>=2.1.2",
-+        "hpack>=2.1.0",
++        "h2>=2.4.1",
 +        "html2text>=2016.1.8",
-+        "hyperframe>=3.2.0",
-+        "lxml>=3.5.0",
++        "hyperframe>=4.0.1",
++        "jsbeautifier>=1.6.3",
++        "lxml>=3.5.0",  # no wheels for 3.6.1 yet.
 +        "Pillow>=3.2",
 +        "passlib>=1.6.5",
 +        "pyasn1>=0.1.9",
 +        "pyOpenSSL>=16.0",
-+        "pyparsing>=2.1",
++        "pyparsing>=2.1.3",
 +        "pyperclip>=1.5.22",
 +        "requests>=2.9.1",
 +        "six>=1.10",
 +        "tornado>=4.3",
 +        "urwid>=1.3.1",
 +        "watchdog>=0.8.3",
++        "brotlipy>=0.5.1",
      ],
      extras_require={
          ':sys_platform == "win32"': [
@@ -70,43 +74,43 @@ Avoid too strict version requirements.
 -            "ipaddress>=1.0.15, <1.1",
 +            "enum34>=1.0.4",
 +            "ipaddress>=1.0.15",
+             "typing==3.5.2.2",
          ],
          'dev': [
--            "coveralls>=1.1, <1.2",
--            "mock>=1.3.0, <1.4",
--            "pytest>=2.8.7,<2.10",
--            "pytest-cov>=2.2.1, <2.3",
--            "pytest-timeout>=1.0.0, <1.1",
--            "pytest-xdist>=1.14, <1.15",
+-            "tox>=2.3, <3",
+-            "mock>=2.0, <2.1",
+-            "pytest>=3, <3.1",
+-            "pytest-cov>=2.2.1, <3",
+-            "pytest-timeout>=1.0.0, <2",
+-            "pytest-xdist>=1.14, <2",
+-            "pytest-faulthandler>=1.3.0, <2",
 -            "sphinx>=1.3.5, <1.5",
 -            "sphinx-autobuild>=0.5.2, <0.7",
--            "sphinxcontrib-documentedlist>=0.3.0, <0.4",
+-            "sphinxcontrib-documentedlist>=0.4.0, <0.5",
 -            "sphinx_rtd_theme>=0.1.9, <0.2",
-+            "coveralls>=1.1",
-+            "mock>=1.3.0",
-+            "pytest>=2.8.7",
++            "tox>=2.3",
++            "mock>=2.0",
++            "pytest>=3",
 +            "pytest-cov>=2.2.1",
 +            "pytest-timeout>=1.0.0",
 +            "pytest-xdist>=1.14",
++            "pytest-faulthandler>=1.3.0",
 +            "sphinx>=1.3.5",
 +            "sphinx-autobuild>=0.5.2",
-+            "sphinxcontrib-documentedlist>=0.3.0",
++            "sphinxcontrib-documentedlist>=0.4.0",
 +            "sphinx_rtd_theme>=0.1.9",
          ],
          'contentviews': [
--            "cssutils>=1.0.1, <1.1",
--            "protobuf>=2.6.1, <2.7",
--            "pyamf>=0.8.0, <0.9",
-+            "cssutils>=1.0.1",
-+            "protobuf>=2.6.1",
-+            "pyamf>=0.8.0",
+             # TODO: Find Python 3 replacements
+-            # "protobuf>=2.6.1, <2.7",
+-            # "pyamf>=0.8.0, <0.9",
++            # "protobuf>=2.6.1",
++            # "pyamf>=0.8.0",
          ],
          'examples': [
--            "beautifulsoup4>=4.4.1, <4.5",
--            "harparser>=0.2, <0.3",
--            "pytz>=2015.07.0, <=2016.3",
+-            "beautifulsoup4>=4.4.1, <4.6",
+-            "pytz>=2015.07.0, <=2016.7",
 +            "beautifulsoup4>=4.4.1",
-+            "harparser>=0.2",
 +            "pytz>=2015.07.0",
          ]
      }