- Update to 1.4

- Add support for stage dir
- Sort variables
- Use new options helper
- Replace pkg-plist with an automatic package list

Release Notes:	http://docs.webob.org/en/latest/news.html

3 files changed, 18 insertions, 93 deletions

diff --git a/www/py-webob/Makefile b/www/py-webob/Makefile
index 81edbdd4be5b..4d23d90b5338 100644
--- a/www/py-webob/Makefile
+++ b/www/py-webob/Makefile
@@ -1,48 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	webob
-PORTVERSION=	1.2.2
+PORTVERSION=	1.4
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PYDISTUTILS_PKGNAME}-${DISTVERSION}
+DISTNAME=	WebOb-${DISTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	WSGI request and response Python object
 
 LICENSE=	MIT
 
-PYDISTUTILS_PKGNAME=	WebOb
-PYDISTUTILS_PKGVERSION=	${DISTVERSION}
-# Python3 ready
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
-USES=		zip
+OPTIONS_DEFINE= DOCS TESTS
 
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-OPTIONS_DEFINE=	DOCS TESTS
+PORTDOCS=	*
+
+PYDISTUTILS_AUTOPLIST=	yes
+PYDISTUTILS_PKGVERSION=	${DISTVERSION}
 
+TESTS_BUILD_DEPENDS=	nosetests:${PORTSDIR}/devel/py-nose
 TESTS_DESC=	Run tests with Nose
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+USE_PYDISTUTILS=	yes
+USE_PYTHON=	yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.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}
+	@(cd ${WRKSRC}/build/sphinx/html && \
+	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objectiv.inv")
 .endif
 
 .if ${PORT_OPTIONS:MTESTS}
-BUILD_DEPENDS+=	nosetests:${PORTSDIR}/devel/py-nose
 PYDISTUTILS_BUILD_TARGET+=	nosetests
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/py-webob/distinfo b/www/py-webob/distinfo
index 171b477bb299..035d85466423 100644
--- a/www/py-webob/distinfo
+++ b/www/py-webob/distinfo
@@ -1,2 +1,2 @@
-SHA256 (WebOb-1.2.2.zip) = 356b7277941fb263bfef9d3c4279fb1058ff9ea91b5f8a886a9579d614c79787
-SIZE (WebOb-1.2.2.zip) = 219653
+SHA256 (WebOb-1.4.tar.gz) = 0819838204e2a6823e42bf2227898fdf3f306f7619bf328e25855a0d1ca20399
+SIZE (WebOb-1.4.tar.gz) = 633302
diff --git a/www/py-webob/pkg-plist b/www/py-webob/pkg-plist
deleted file mode 100644
index 5f438b5eb773..000000000000
--- a/www/py-webob/pkg-plist
+++ /dev/null
@@ -1,72 +0,0 @@
-%%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%%