3 files changed, 101 insertions, 6 deletions

diff --git a/www/py-webob/Makefile b/www/py-webob/Makefile
index f59d1dfb1118..2da1162fea8a 100644
--- a/www/py-webob/Makefile
+++ b/www/py-webob/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	webob
-DISTVERSION=	1.2b3
+PORTVERSION=	1.2.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,9 +19,34 @@ LICENSE=	MIT
 
 PYDISTUTILS_PKGNAME=	WebOb
 PYDISTUTILS_PKGVERSION=	${DISTVERSION}
-USE_PYTHON=	2.6+
+# Python3 ready
+USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 
 USE_ZIP=	yes
 
-.include <bsd.port.mk>
+OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
+OPTIONS_DEFINE=	DOCS TESTS
+
+TESTS_DESC=	Run tests with Nose
+
+.include <bsd.port.options.mk>
+
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
+PYDISTUTILS_BUILD_TARGET+=	build_sphinx -a -E
+
+post-install:
+	@cd ${WRKSRC}/build/sphinx/html && \
+	${COPYTREE_SHARE} . ${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MTESTS}
+BUILD_DEPENDS+=	nosetests:${PORTSDIR}/devel/py-nose
+PYDISTUTILS_BUILD_TARGET+=	nosetests
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/www/py-webob/distinfo b/www/py-webob/distinfo
index 097a7db136c4..1260e47ba9b0 100644
--- a/www/py-webob/distinfo
+++ b/www/py-webob/distinfo
@@ -1,2 +1,2 @@
-SHA256 (WebOb-1.2b3.zip) = e0ac09805a9643d5b1bf5753adbf089cd52a6ff97fc2873bf17c2a82d9a49efb
-SIZE (WebOb-1.2b3.zip) = 204370
+SHA256 (WebOb-1.2.1.zip) = 45bd466b0a67acd168d67ea43482264c71f126d8ebe879041da674df79322610
+SIZE (WebOb-1.2.1.zip) = 218347
diff --git a/www/py-webob/pkg-plist b/www/py-webob/pkg-plist
index 7767d3e76aa1..5f438b5eb773 100644
--- a/www/py-webob/pkg-plist
+++ b/www/py-webob/pkg-plist
@@ -1,2 +1,72 @@
-@comment $FreeBSD$
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+%%PORTDOCS%%%%DOCSDIR%%/.buildinfo
+%%PORTDOCS%%%%DOCSDIR%%/_sources/comment-example.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/differences.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/do-it-yourself.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/file-example.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/index.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/jsonrpc-example.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/license.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/modules/client.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/modules/dec.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/modules/static.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/modules/webob.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/news.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/pycon2011/pycon-py3k-sprint.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/reference.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/test-file.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/test_dec.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/test_request.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/test_response.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/wiki-example.txt
+%%PORTDOCS%%%%DOCSDIR%%/_static/ajax-loader.gif
+%%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/comment-bright.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/comment-close.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/comment.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/default.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/down-pressed.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/down.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/file.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/minus.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/plus.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/sidebar.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/underscore.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/up.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js
+%%PORTDOCS%%%%DOCSDIR%%/comment-example.html
+%%PORTDOCS%%%%DOCSDIR%%/differences.html
+%%PORTDOCS%%%%DOCSDIR%%/do-it-yourself.html
+%%PORTDOCS%%%%DOCSDIR%%/file-example.html
+%%PORTDOCS%%%%DOCSDIR%%/genindex.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/jsonrpc-example.html
+%%PORTDOCS%%%%DOCSDIR%%/license.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/client.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/dec.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/static.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/webob.html
+%%PORTDOCS%%%%DOCSDIR%%/news.html
+%%PORTDOCS%%%%DOCSDIR%%/objects.inv
+%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html
+%%PORTDOCS%%%%DOCSDIR%%/pycon2011/pycon-py3k-sprint.html
+%%PORTDOCS%%%%DOCSDIR%%/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/search.html
+%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
+%%PORTDOCS%%%%DOCSDIR%%/test-file.html
+%%PORTDOCS%%%%DOCSDIR%%/test_dec.html
+%%PORTDOCS%%%%DOCSDIR%%/test_request.html
+%%PORTDOCS%%%%DOCSDIR%%/test_response.html
+%%PORTDOCS%%%%DOCSDIR%%/wiki-example.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pycon2011
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/modules
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/_static
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/_sources/pycon2011
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/_sources/modules
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/_sources
+%%PORTDOCS%%@dirrm %%DOCSDIR%%