- update to 3.0.1

- trim Makefile header
- convert to optionsng
- remove shlib versions (porlint warning)
- fix packing list when build with python32
- tab -> space change in pkg-descr:WWW

PR:		172709
Submitted by:	rm (myself)
Approved by:	maintainer timeout (2 weeks)
Feature safe:	yes

4 files changed, 59 insertions, 80 deletions

diff --git a/devel/py-lxml/Makefile b/devel/py-lxml/Makefile
index 51b81c5546b0..16db9bcb0b7b 100644
--- a/devel/py-lxml/Makefile
+++ b/devel/py-lxml/Makefile
@@ -1,11 +1,8 @@
-# Ports collection makefile for:	py-lxml
-# Date created:				Feb 18, 2007
-# Whom:					Robert Gogolok <gogo@cs.uni-sb.de>
-#
+# Created by: Robert Gogolok <gogo@cs.uni-sb.de>
 # $FreeBSD$
 
 PORTNAME=	lxml
-PORTVERSION=	2.3.4
+PORTVERSION=	3.0.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,8 +12,8 @@ COMMENT=	Pythonic binding for the libxml2 and libxslt libraries
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		xslt.2:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
+		xslt:${PORTSDIR}/textproc/libxslt
 
 # Python3 ready
 USE_PYTHON=	yes
@@ -32,11 +29,17 @@ PORTDOCS=	CHANGES.txt \
 		TODO.txt \
 		README.rst
 
+.include <bsd.port.pre.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PYTHON_REL} >= 320
+.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc"
+.endif
+
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/py-lxml/distinfo b/devel/py-lxml/distinfo
index 86ede0c73a7e..00afb98d281a 100644
--- a/devel/py-lxml/distinfo
+++ b/devel/py-lxml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lxml-2.3.4.tar.gz) = ba7fe2974dc276dd1b83e1c407d66c7ad3ee64338f753d4f657afca96c49ba6c
-SIZE (lxml-2.3.4.tar.gz) = 3150931
+SHA256 (lxml-3.0.1.tar.gz) = 50367b086d18b1cadc8d6ddf2525495d9d216b81e9a700f6aa7ea2f7e9dfaa78
+SIZE (lxml-3.0.1.tar.gz) = 3205224
diff --git a/devel/py-lxml/pkg-descr b/devel/py-lxml/pkg-descr
index 468d74b19a2c..09e2b53e2768 100644
--- a/devel/py-lxml/pkg-descr
+++ b/devel/py-lxml/pkg-descr
@@ -6,4 +6,4 @@ lxml is a Python binding for libxml2 and libxslt. Its aim:
   * Safe (no segfaults).
   * No manual memory management!
 
-WWW:	http://lxml.de/
+WWW: http://lxml.de/
diff --git a/devel/py-lxml/pkg-plist b/devel/py-lxml/pkg-plist
index 7696d0f5f5e5..05ba634fdc27 100644
--- a/devel/py-lxml/pkg-plist
+++ b/devel/py-lxml/pkg-plist
@@ -26,17 +26,12 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/etree.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/etree.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/etree.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/etree_defs.h
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/etreepublic.pxd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/ElementSoup.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/ElementSoup.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/ElementSoup.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/_dictmixin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/_dictmixin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/_dictmixin.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/_diffcommand.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/_diffcommand.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/_diffcommand.pyo
@@ -70,6 +65,26 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/usedoctest.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/usedoctest.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html/usedoctest.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/c14n.pxd
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/config.pxd
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/dtdvalid.pxd
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/etree_defs.h
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/etreepublic.pxd
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/htmlparser.pxd
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/lxml-version.h
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/relaxng.pxd
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/schematron.pxd
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/tree.pxd
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/uri.pxd
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/xinclude.pxd
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/xmlerror.pxd
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/xmlparser.pxd
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/xmlschema.pxd
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/xpath.pxd
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes/xslt.pxd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/isoschematron/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/isoschematron/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/isoschematron/__init__.pyo
@@ -82,6 +97,8 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_skeleton_for_xslt1.xsl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_svrl_for_xslt1.xsl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/lxml.etree.h
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/lxml.etree_api.h
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/objectify.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/objectify.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/objectify.pyo
@@ -92,7 +109,6 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/sax.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/sax.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/sax.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/tree.pxd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/usedoctest.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/usedoctest.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/usedoctest.pyo
@@ -108,6 +124,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/doc/extensions.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/FAQ.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/abc.ABCMeta-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/api-objects.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/class-tree.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/deprecated-index.html
@@ -154,24 +171,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.builder.ElementMaker-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect-pysrc.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.Attrib-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.CSSSelector-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.Class-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.CombinedSelector-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.Element-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.ExpressionError-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.Function-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.Hash-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.Or-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.Pseudo-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.SelectorSyntaxError-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.String-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.Symbol-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.Token-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.TokenStream-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.XPathExpr-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.XPathExprOr-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect._UniToken-class.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.LxmlHTMLTranslator-class.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.cssselect.LxmlTranslator-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.doctestcompare-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.doctestcompare-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.doctestcompare.LHTMLOutputChecker-class.html
@@ -254,68 +256,33 @@
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree.XSLTExtensionError-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree.XSLTParseError-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree.XSLTSaveError-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._AppendOnlyElementProxy-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._Attrib-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._AttribIterator-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._BaseContext-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._BaseErrorLog-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._BaseParser-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ClassNamespaceRegistry-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._Comment-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._Document-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._DomainErrorLog-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._Element-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ElementIterator-class.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ElementMatchIterator-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ElementStringResult-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ElementTagMatcher-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ElementTree-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ElementUnicodeResult-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._Entity-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ErrorLog-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ExceptionContext-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ExsltRegExp-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._FeedParser-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._FileReaderContext-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._FilelikeWriter-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._FunctionNamespaceRegistry-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._IDDict-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._InputDocument-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._IterparseContext-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ListErrorLog-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._LogEntry-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ModifyContentOnlyEntityProxy-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ModifyContentOnlyPIProxy-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ModifyContentOnlyProxy-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._NamespaceRegistry-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._OpaqueDocumentWrapper-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._OpaqueNodeWrapper-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ParserContext-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ParserDictionaryContext-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ParserSchemaValidationContext-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ProcessingInstruction-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._PythonSaxParserTarget-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ReadOnlyElementProxy-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ReadOnlyEntityProxy-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ReadOnlyPIProxy-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ReadOnlyProxy-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ResolverContext-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._ResolverRegistry-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._RotatingErrorLog-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._SaxParserContext-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._SaxParserTarget-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._TargetParserContext-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._TargetParserResult-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._TempStore-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._Validator-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._XPathContext-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._XPathEvaluatorBase-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._XPathFunctionNamespaceRegistry-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._XSLTContext-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._XSLTProcessingInstruction-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._XSLTQuotedStringParam-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._XSLTResolverContext-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree._XSLTResultTree-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree.__ContentOnlyElement-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree.iterparse-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.etree.iterwalk-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.html-module.html
@@ -371,8 +338,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.html.soupparser-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.html.usedoctest-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.html.usedoctest-pysrc.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.include-module.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.include-pysrc.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.includes-module.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.includes-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.isoschematron-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.isoschematron-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.isoschematron.Schematron-class.html
@@ -406,6 +373,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.common_imports.LargeFileLike-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.common_imports.LargeFileLikeUnicode-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.common_imports.SillyFileLike-class.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.common_imports.skipif-class.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_builder-module.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_builder-pysrc.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_builder.BuilderTestCase-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_classlookup-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_classlookup-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_classlookup.ClassLookupTestCase-class.html
@@ -419,8 +390,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_elementtree-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_elementtree.CElementTreeTestCase-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_elementtree.ETreeTestCase-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_elementtree.ETreeTestCaseBase-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_elementtree.ElementTreeTestCase-class.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_elementtree._ETreeTestCaseBase-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_errors-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_errors-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_errors.ErrorTestCase-class.html
@@ -432,7 +403,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_etree.ETreeWriteTestCase-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_etree.ETreeXIncludeTestCase-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_etree.ElementIncludeTestCase-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_etree.XIncludeTestCase-class.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_etree._XIncludeTestCase-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_htmlparser-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_htmlparser-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_htmlparser.HtmlParserTestCase-class.html
@@ -440,7 +411,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_io-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_io.ETreeIOTestCase-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_io.ElementTreeIOTestCase-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_io.IOTestCaseBase-class.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_io._IOTestCaseBase-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_isoschematron-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_isoschematron-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_isoschematron.ETreeISOSchematronTestCase-class.html
@@ -491,6 +462,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_xpathevaluator.ETreeXPathTestCase-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_xslt-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_xslt-pysrc.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_xslt.ETreeEXSLTTestCase-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_xslt.ETreeXSLTExtElementTestCase-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_xslt.ETreeXSLTExtFuncTestCase-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.tests.test_xslt.ETreeXSLTTestCase-class.html
@@ -499,6 +471,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/lxml.usedoctest-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/module-tree.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/redirect.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/str-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-everything.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.ElementInclude-module.html
@@ -516,13 +489,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.html.html5parser-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.html.soupparser-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.html.usedoctest-module.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.include-module.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.includes-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.isoschematron-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.objectify-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.pyclasslookup-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.sax-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.tests-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.tests.common_imports-module.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.tests.test_builder-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.tests.test_classlookup-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.tests.test_css-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc-lxml.tests.test_dtd-module.html
@@ -548,13 +522,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/toc.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/xml.etree.ElementTree-module.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/xml.etree.ElementTree-pysrc.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/xml.etree.ElementTree.Element-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/xml.etree.ElementTree.ElementTree-class.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/xml.etree.ElementTree.ParseError-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/xml.etree.ElementTree.QName-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/xml.etree.ElementTree.TreeBuilder-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/xml.etree.ElementTree.XMLTreeBuilder-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/xml.etree.ElementTree._ElementInterface-class.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/xml.etree.ElementTree.XMLParser-class.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/xml.etree.ElementTree._IterParseIterator-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api/xml.etree.ElementTree._SimpleElementPath-class.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/api/xml.etree.ElementTree.iterparse-class.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/build.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/capi.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/changes-%%PORTVERSION%%.html
@@ -646,6 +621,7 @@
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/isoschematron/resources/rng
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/isoschematron/resources
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/isoschematron
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/includes
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/html
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO