4 files changed, 121 insertions, 22 deletions

diff --git a/www/py-pyquery/Makefile b/www/py-pyquery/Makefile
index 66310dc56733..c96314e6df1c 100644
--- a/www/py-pyquery/Makefile
+++ b/www/py-pyquery/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pyquery
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.6
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,11 +10,60 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A jquery-like library for python
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:${PORTSDIR}/www/py-cssselect
+LICENSE=	BSD
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:${PORTSDIR}/www/py-cssselect \
+		${PYTHON_PKGNAMEPREFIX}lxml>=2.1:${PORTSDIR}/devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:${PORTSDIR}/www/py-webob
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:${PORTSDIR}/www/py-cssselect \
+		${PYTHON_PKGNAMEPREFIX}lxml>=2.1:${PORTSDIR}/devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:${PORTSDIR}/www/py-webob
+
+# required by stage: target
+MAKE_ENV=	PYTHONUSERBASE=${STAGEDIR}${PYTHONBASE}
+
+OPTIONS_DEFINE=	DOCS
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
+USE_ZIP=	yes
+
+# required by stage: target
+stage-dir: stage-python-dirs
+stage-python-dirs:
+	@${MKDIR} ${STAGEDIR}${PYEASYINSTALL_BINDIR} \
+	${STAGEDIR}${PYEASYINSTALL_SITELIBDIR}
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKSRC}/docs/_build/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+.endif
+# required by stage: target
+	@(cd ${STAGEDIR}${PREFIX} && \
+	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
+
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+PYDISTUTILS_BUILD_TARGET+=	build_sphinx -a -E
+.endif
+
+# required by stage: target
+.undef PYDISTUTILS_INSTALLARGS
+PYDISTUTILS_INSTALLARGS=	--always-unzip \
+				--install-dir ${STAGEDIR}${PYEASYINSTALL_SITELIBDIR} \
+				--multi-version \
+				--no-deps \
+				--quiet \
+				--script-dir ${STAGEDIR}${PYEASYINSTALL_BINDIR} \
+				--site-dir ${STAGEDIR}${PYEASYINSTALL_SITELIBDIR} \
+				--user \
+				${WRKSRC}/dist/${PYEASYINSTALL_EGG}
 
-NO_STAGE=	yes
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/py-pyquery/distinfo b/www/py-pyquery/distinfo
index 9960be74aa28..f3ca140edf0d 100644
--- a/www/py-pyquery/distinfo
+++ b/www/py-pyquery/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pyquery-1.2.1.tar.gz) = a607f81a628887e2cf03d5dddee6f092faf411e51b894130a2b4c839e60c408f
-SIZE (pyquery-1.2.1.tar.gz) = 21534
+SHA256 (pyquery-1.2.6.zip) = 732bbb1758508a1284b53fcdce9d96aa53cb63ce93d54b38d286f4281a12ac24
+SIZE (pyquery-1.2.6.zip) = 41203
diff --git a/www/py-pyquery/pkg-descr b/www/py-pyquery/pkg-descr
index 028d99a7f0f2..99440c53be19 100644
--- a/www/py-pyquery/pkg-descr
+++ b/www/py-pyquery/pkg-descr
@@ -2,4 +2,4 @@ pyquery allows you to make jquery queries on XML documents.
 The API is as much as possible the similar to jquery (http://jquery.com).
 pyquery uses lxml for fast XML and HTML manipulation.
 
-WWW:	http://pyquery.org
+WWW: https://pypi.python.org/pypi/pyquery
diff --git a/www/py-pyquery/pkg-plist b/www/py-pyquery/pkg-plist
index 87cbd39c94ad..9126e328d6cb 100644
--- a/www/py-pyquery/pkg-plist
+++ b/www/py-pyquery/pkg-plist
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 %%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
@@ -8,24 +7,75 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/ajax.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/ajax.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/ajax.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/cssselectpatch.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/cssselectpatch.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/cssselectpatch.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/openers.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/openers.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/pyquery.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/pyquery.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/pyquery.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/rules.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/rules.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/rules.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/test.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/test.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/test.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/test.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/tests.txt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+%%PORTDOCS%%%%DOCSDIR%%/.buildinfo
+%%PORTDOCS%%%%DOCSDIR%%/_modules/index.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/pyquery/ajax.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/pyquery/pyquery.html
+%%PORTDOCS%%%%DOCSDIR%%/_sources/ajax.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/api.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/attributes.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/changes.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/css.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/future.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/index.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/manipulating.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/scrap.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/testing.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/tips.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/traversing.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/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/nature.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/plus.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/underscore.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/up.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js
+%%PORTDOCS%%%%DOCSDIR%%/ajax.html
+%%PORTDOCS%%%%DOCSDIR%%/api.html
+%%PORTDOCS%%%%DOCSDIR%%/attributes.html
+%%PORTDOCS%%%%DOCSDIR%%/changes.html
+%%PORTDOCS%%%%DOCSDIR%%/css.html
+%%PORTDOCS%%%%DOCSDIR%%/future.html
+%%PORTDOCS%%%%DOCSDIR%%/genindex.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/manipulating.html
+%%PORTDOCS%%%%DOCSDIR%%/objects.inv
+%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html
+%%PORTDOCS%%%%DOCSDIR%%/scrap.html
+%%PORTDOCS%%%%DOCSDIR%%/search.html
+%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
+%%PORTDOCS%%%%DOCSDIR%%/testing.html
+%%PORTDOCS%%%%DOCSDIR%%/tips.html
+%%PORTDOCS%%%%DOCSDIR%%/traversing.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/_static
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/_sources
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/_modules/pyquery
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/_modules
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%