3 files changed, 21 insertions, 69 deletions

diff --git a/www/py-pyquery/Makefile b/www/py-pyquery/Makefile
index 990850008d62..a711739e4b89 100644
--- a/www/py-pyquery/Makefile
+++ b/www/py-pyquery/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pyquery
-PORTVERSION=	1.2.6
+PORTVERSION=	1.2.8
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A jquery-like library for python
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:${PORTSDIR}/www/py-cssselect \
 		${PYTHON_PKGNAMEPREFIX}lxml>=2.1:${PORTSDIR}/devel/py-lxml \
@@ -19,51 +19,26 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:${PORTSDIR}/www/py-cssselec
 		${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}
+DOCS_BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		zip
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_AUTOPLIST=	yes
 
-# required by stage: target
-stage-dir: stage-python-dirs
-stage-python-dirs:
-	@${MKDIR} ${STAGEDIR}${PYEASYINSTALL_BINDIR} \
-	${STAGEDIR}${PYEASYINSTALL_SITELIBDIR}
+USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
+USES=		zip
 
 .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}
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKSRC}/docs/_build/html && \
+	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -or ! -name objects.inv")
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/py-pyquery/distinfo b/www/py-pyquery/distinfo
index f3ca140edf0d..b5be9f748eed 100644
--- a/www/py-pyquery/distinfo
+++ b/www/py-pyquery/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pyquery-1.2.6.zip) = 732bbb1758508a1284b53fcdce9d96aa53cb63ce93d54b38d286f4281a12ac24
-SIZE (pyquery-1.2.6.zip) = 41203
+SHA256 (pyquery-1.2.8.zip) = 59af39301bad397e085e5080987f94ef30672f1cf8e73d19d3307b3b63c3cb4b
+SIZE (pyquery-1.2.8.zip) = 42552
diff --git a/www/py-pyquery/pkg-plist b/www/py-pyquery/pkg-plist
index 9126e328d6cb..ef336cf4a34b 100644
--- a/www/py-pyquery/pkg-plist
+++ b/www/py-pyquery/pkg-plist
@@ -1,22 +1,3 @@
-%%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/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%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/ajax.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/ajax.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/cssselectpatch.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/cssselectpatch.pyc
-%%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/rules.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyquery/rules.pyc
 %%PORTDOCS%%%%DOCSDIR%%/.buildinfo
 %%PORTDOCS%%%%DOCSDIR%%/_modules/index.html
 %%PORTDOCS%%%%DOCSDIR%%/_modules/pyquery/ajax.html
@@ -69,13 +50,9 @@
 %%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%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/_static
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/_sources
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/_modules/pyquery
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/_modules
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrmtry %%PYTHON_LIBDIR%%