- Update to 0.10

- While I'm here:
  - Use PYDISTUTILS_AUTOPLIST and PLIST_FILES instead of PLIST
  - Use USE_PYDISTUTILS=yes
  - Support STAGEDIR

Changes:	https://github.com/mitmproxy/mitmproxy/blob/master/CHANGELOG
PR:		ports/186935
Submitted by:	Hung-Yi Chen <gaod@hychen.org> (maintainer)

4 files changed, 13 insertions, 149 deletions

diff --git a/www/mitmproxy/Makefile b/www/mitmproxy/Makefile
index 4e6735d7e9cb..c1d64586d90a 100644
--- a/www/mitmproxy/Makefile
+++ b/www/mitmproxy/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mitmproxy
-PORTVERSION=	0.9.2
+PORTVERSION=	0.10
 CATEGORIES=	www python
 MASTER_SITES=	http://mitmproxy.org/download/
 
@@ -13,15 +13,17 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1>0:${PORTSDIR}/devel/py-asn1 \
 		${PYTHON_PKGNAMEPREFIX}Flask>0:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}imaging>0:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
 		${PYTHON_PKGNAMEPREFIX}netlib>0:${PORTSDIR}/net/py-netlib \
 		${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}pillow>=2.3.0:${PORTSDIR}/graphics/py-pillow \
 		${PYTHON_PKGNAMEPREFIX}urwid>0:${PORTSDIR}/devel/py-urwid
 
-USE_PYDISTUTILS=easy_install
+PYDISTUTILS_AUTOPLIST=	yes
+USE_PYDISTUTILS=yes
 USE_PYTHON=	yes
-PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHONVERSION=${PYTHON_VER}
 
-NO_STAGE=	yes
+PLIST_FILES=	bin/mitmdump \
+		bin/mitmproxy
+
 .include <bsd.port.mk>
diff --git a/www/mitmproxy/distinfo b/www/mitmproxy/distinfo
index 8fba2ed51f12..81556d478262 100644
--- a/www/mitmproxy/distinfo
+++ b/www/mitmproxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mitmproxy-0.9.2.tar.gz) = 00b200cd7867ca7b0c907bb6a05075807040318cb32fc6bedcd4cb8363c6d795
-SIZE (mitmproxy-0.9.2.tar.gz) = 3180194
+SHA256 (mitmproxy-0.10.tar.gz) = 524e3e91ec9b63f1aec4fd86c55a43e935808da7d558d806c1212b4ba18deea5
+SIZE (mitmproxy-0.10.tar.gz) = 3408925
diff --git a/www/mitmproxy/files/patch-setup.py b/www/mitmproxy/files/patch-setup.py
index b8c2f4d5fdfd..cee9243fdfba 100644
--- a/www/mitmproxy/files/patch-setup.py
+++ b/www/mitmproxy/files/patch-setup.py
@@ -1,12 +1,12 @@
---- setup.py.orig	2013-07-23 03:08:39.785592808 +0800
-+++ setup.py	2013-07-23 03:09:19.367592415 +0800
+--- setup.py.orig	2014-02-21 08:17:11.000000000 +0800
++++ setup.py	2014-02-21 08:19:43.000000000 +0800
 @@ -1,4 +1,5 @@
  from distutils.core import setup
 +from setuptools import setup
  import fnmatch, os.path
  from libmproxy import version
  
-@@ -92,13 +93,4 @@
+@@ -98,13 +99,4 @@
              "Topic :: Internet :: Proxy Servers",
              "Topic :: Software Development :: Testing"
          ],
@@ -15,7 +15,7 @@
 -            "urwid>=1.1",
 -            "pyasn1>0.1.2",
 -            "pyopenssl>=0.13",
--            "PIL",
+-            "Pillow>=2.3.0,<2.4",
 -            "lxml",
 -            "flask"
 -        ],
diff --git a/www/mitmproxy/pkg-plist b/www/mitmproxy/pkg-plist
deleted file mode 100644
index 99b2528c7161..000000000000
--- a/www/mitmproxy/pkg-plist
+++ /dev/null
@@ -1,138 +0,0 @@
-bin/mitmdump
-bin/mitmproxy
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/app.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/cmdline.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/controller.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/dump.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/encoding.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/filt.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/flow.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/proxy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/script.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/tnetstring.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/version.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/app.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/cmdline.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/controller.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/dump.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/encoding.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/filt.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/flow.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/proxy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/script.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/tnetstring.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/version.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/app.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/cmdline.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/controller.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/dump.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/encoding.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/filt.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/flow.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/proxy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/script.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/tnetstring.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/version.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/common.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/contentview.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/flowdetailview.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/flowlist.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/flowview.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/grideditor.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/help.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/palettes.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/common.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/contentview.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/flowdetailview.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/flowlist.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/flowview.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/grideditor.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/help.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/palettes.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/common.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/contentview.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/flowdetailview.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/flowlist.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/flowview.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/grideditor.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/help.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/palettes.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/html2text.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/pyparsing.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/html2text.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/pyparsing.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/html2text.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/pyparsing.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/evalbased.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/packer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/urlencode.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/evalbased.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/packer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/urlencode.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/evalbased.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/packer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/urlencode.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/linux.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/osx.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/pf.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/linux.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/osx.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/pf.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/linux.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/osx.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/pf.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/static/bootstrap.min.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/static/bootstrap.min.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/static/jquery-1.10.1.min.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/static/jquery.localscroll-min.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/static/jquery.scrollTo-min.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/static/mitmproxy.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/templates/certs.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/templates/frame.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/templates/index.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/templates/layout.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/mitmproxy
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/mitmdump
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/static
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%