- Update to 0.9.1 [1]

- Add python to CATEGORIES    [1]
- Don't use/fetch objects.inv from Python site, because there is
  no reference to the standard library in the port docs, and so
  remove also the post-patch target
- Specify the clause of BSD license
- Allow to build port with Python 3    [1]
- Add support for stage dir    [1]
- Use PYDISTUTILS_AUTOPLIST    [1]
- Clean a bit the documentation part (install only necessary files)    [1]
- Fix format of WWW field in pkg-descr    [1]

PR:	ports/186328
Submitted by:	olivierd

5 files changed, 30 insertions, 47 deletions

diff --git a/www/py-cssselect/Makefile b/www/py-cssselect/Makefile
index 12b18ed107b0..08132eff4cd5 100644
--- a/www/py-cssselect/Makefile
+++ b/www/py-cssselect/Makefile
@@ -2,50 +2,38 @@
 # $FreeBSD$
 
 PORTNAME=	cssselect
-PORTVERSION=	0.7.1
+PORTVERSION=	0.9.1
 #PORTREVISION=	0
-CATEGORIES=	www
-MASTER_SITES=	CHEESESHOP http://docs.python.org/:sphinx
+CATEGORIES=	www python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
-DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Cssselect parses CSS3 Selectors and translates them to XPath 1.0
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	DOCS
+OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-# Python3 ready
-USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
+.include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 SPHINX_BUILD=	sphinx-build
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	 objects.inv:sphinx
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
-
-REINPLACE_ARGS=	-i.bak -e 's,%%DISTDIR%%,${DISTDIR},g' \
-		-e 's,%%PORTNAME%%,${PORTNAME},g'
-
-post-patch:
-	${REINPLACE_CMD} ${WRKSRC}/docs/conf.py
-
-post-install:
-	${SETENV} PYTHONPATH="${PYTHONPREFIX_SITELIBDIR}" \
-	${SPHINX_BUILD} -N -a -b html ${WRKSRC}/docs ${WRKSRC}/docs.html && \
-	cd ${WRKSRC}/docs.html && ${MKDIR} ${DOCSDIR} && \
-	${COPYTREE_SHARE} . ${DOCSDIR}
+post-install::
+	${SETENV} PYTHONPATH="${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}" \
+	${SPHINX_BUILD} -N -a -b html ${WRKSRC}/docs ${WRKSRC}/docs.html
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs.html && \
+		${COPYTREE_SHARE:S,\$2,& \! -name .buildinfo -and \! -path *doctrees*,g} \
+		. ${STAGEDIR}${DOCSDIR})
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/py-cssselect/distinfo b/www/py-cssselect/distinfo
index 05e6cc51a09b..a194cf56a943 100644
--- a/www/py-cssselect/distinfo
+++ b/www/py-cssselect/distinfo
@@ -1,4 +1,2 @@
-SHA256 (cssselect/cssselect-0.7.1.tar.gz) = 74f411a349fcfb676b68336fcae8799ba9fbb0a0446562f544dee019fb0e2ae7
-SIZE (cssselect/cssselect-0.7.1.tar.gz) = 30480
-SHA256 (cssselect/objects.inv) = ed23f7aa1326b6f9b9dce41f452a9a0dff6da38f6e66c8a4cf4f164553947943
-SIZE (cssselect/objects.inv) = 114160
+SHA256 (cssselect-0.9.1.tar.gz) = 0535a7e27014874b27ae3a4d33e8749e345bdfa62766195208b7996bf1100682
+SIZE (cssselect-0.9.1.tar.gz) = 32952
diff --git a/www/py-cssselect/files/patch-docs__conf.py b/www/py-cssselect/files/patch-docs__conf.py
index 6943f70620ac..724522550bf6 100644
--- a/www/py-cssselect/files/patch-docs__conf.py
+++ b/www/py-cssselect/files/patch-docs__conf.py
@@ -1,8 +1,10 @@
---- ./docs/conf.py.orig	2012-07-16 23:28:27.000000000 +0200
-+++ ./docs/conf.py	2012-07-16 23:28:52.000000000 +0200
-@@ -247,4 +247,4 @@
+--- ./docs/conf.py.orig	2014-04-01 22:42:52.000000000 +0200
++++ ./docs/conf.py	2014-04-01 22:43:15.000000000 +0200
+@@ -244,7 +244,3 @@
  
- 
- # Example configuration for intersphinx: refer to the Python standard library.
+ # How to display URL addresses: 'footnote', 'no', or 'inline'.
+ #texinfo_show_urls = 'footnote'
+-
+-
+-# Example configuration for intersphinx: refer to the Python standard library.
 -intersphinx_mapping = {'http://docs.python.org/': None}
-+intersphinx_mapping = {'http://docs.python.org/': '%%DISTDIR%%/%%PORTNAME%%/objects.inv'}
diff --git a/www/py-cssselect/pkg-descr b/www/py-cssselect/pkg-descr
index 00e81a4ed339..54f4d0ca8192 100644
--- a/www/py-cssselect/pkg-descr
+++ b/www/py-cssselect/pkg-descr
@@ -5,4 +5,4 @@ to find the matching elements in an XML or HTML document.
 This module used to live inside of lxml as ``lxml.cssselect`` before it was
 extracted as a stand-alone project.
 
-WWW:	http://packages.python.org/cssselect/
+WWW: http://packages.python.org/cssselect/
diff --git a/www/py-cssselect/pkg-plist b/www/py-cssselect/pkg-plist
index 856a6dff3b21..8c141245cc74 100644
--- a/www/py-cssselect/pkg-plist
+++ b/www/py-cssselect/pkg-plist
@@ -1,7 +1,3 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-%%PORTDOCS%%%%DOCSDIR%%/.buildinfo
-%%PORTDOCS%%%%DOCSDIR%%/.doctrees/environment.pickle
-%%PORTDOCS%%%%DOCSDIR%%/.doctrees/index.doctree
 %%PORTDOCS%%%%DOCSDIR%%/_sources/index.txt
 %%PORTDOCS%%%%DOCSDIR%%/_static/ajax-loader.gif
 %%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
@@ -31,5 +27,4 @@
 %%PORTDOCS%%%%DOCSDIR%%/searchindex.js
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/_static
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/_sources
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/.doctrees
 %%PORTDOCS%%@dirrm %%DOCSDIR%%