9 files changed, 1 insertions, 120 deletions

diff --git a/MOVED b/MOVED
index 9eaf17183316..99d623faa7f8 100644
--- a/MOVED
+++ b/MOVED
@@ -7869,3 +7869,4 @@ japanese/marumoji-fonts|japanese/font-marumoji|2015-09-13|Renamed
 www/asp-php||2015-09-13|Unmaintained upstream, generate unsupported php
 textproc/py-xmltools||2015-09-15|Remove port marked broken for six months: fetch failed
 security/krb5-111|security/krb5-112|2015-09-15|krb5-1.11 EOLed by MIT in December 2014
+textproc/py-xml||2015-09-16|Remove: this package is available in standard python library since 2.2
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index 24dabc81462e..a2695f9bc2a1 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -538,7 +538,6 @@ CMAKE_ARGS+=	-DPython_ADDITIONAL_VERSIONS=${PYTHON_VER}
 PYGAME=		${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
 PYNUMERIC=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
 PYNUMPY=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy
-PYXML=		${PYTHON_SITELIBDIR}/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml
 
 # dependencies
 .if defined(_PYTHON_BUILD_DEP)
diff --git a/textproc/Makefile b/textproc/Makefile
index d5cb5c40413b..eb5f99871a8c 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1282,7 +1282,6 @@
     SUBDIR += py-xlutils
     SUBDIR += py-xlwriter
     SUBDIR += py-xlwt
-    SUBDIR += py-xml
     SUBDIR += py-xmltv
     SUBDIR += py-zope.app.i18n
     SUBDIR += py-zope.app.locales
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
deleted file mode 100644
index 5b3b1bf6d421..000000000000
--- a/textproc/py-xml/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Created by: nectar@FreeBSD.org
-# $FreeBSD$
-
-PORTNAME=	xml
-PORTVERSION=	0.8.4
-PORTREVISION=	4
-CATEGORIES=	textproc python
-MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	PyXML-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Python XML library enhancements
-
-USES=		python shebangfix
-SHEBANG_FILES=	demo/dom/html2html
-USE_PYTHON=	distutils autoplist
-
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-PLIST_SUB+=	PACKAGE_DIR=_xmlplus
-
-PORTEXAMPLES=	*
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	DOCS EXAMPLES XSLT XPATH
-OPTIONS_DEFAULT=XPATH
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MXSLT}
-PYDISTUTILS_BUILDARGS+=		--with-xslt
-PYDISTUTILS_INSTALLARGS+=	--with-xslt
-.else
-PYDISTUTILS_BUILDARGS+=		--without-xslt
-PYDISTUTILS_INSTALLARGS+=	--without-xslt
-.endif
-
-.if ${PORT_OPTIONS:MXPATH}
-PYDISTUTILS_BUILDARGS+=		--with-xpath
-PYDISTUTILS_INSTALLARGS+=	--with-xpath
-.else
-PYDISTUTILS_BUILDARGS+=		--without-xpath
-PYDISTUTILS_INSTALLARGS+=	--without-xpath
-.endif
-
-post-install:
-	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PACKAGE_DIR} -name '*.so' | ${XARGS} ${STRIP_CMD}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for docfile in ANNOUNCE CREDITS LICENCE README* TODO
-	${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR}
-.endfor
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} "demo test" ${STAGEDIR}${EXAMPLESDIR}
-
-.include <bsd.port.post.mk>
diff --git a/textproc/py-xml/distinfo b/textproc/py-xml/distinfo
deleted file mode 100644
index 3ece8f0c1d7a..000000000000
--- a/textproc/py-xml/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (PyXML-0.8.4.tar.gz) = 9fab66f9584fb8e67aebd8745a5c97bf1c5a2e2e461adf68862bcec64e448c13
-SIZE (PyXML-0.8.4.tar.gz) = 734954
diff --git a/textproc/py-xml/files/patch-xml-xpath-ParsedAbbreviatedAbsoluteLocationPath.py b/textproc/py-xml/files/patch-xml-xpath-ParsedAbbreviatedAbsoluteLocationPath.py
deleted file mode 100644
index 1aa89d886448..000000000000
--- a/textproc/py-xml/files/patch-xml-xpath-ParsedAbbreviatedAbsoluteLocationPath.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py.orig	2009-07-09 08:48:55.000000000 +0800
-+++ xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2009-07-09 08:49:09.000000000 +0800
-@@ -24,8 +24,8 @@
-         self._rel = rel
-         nt = ParsedNodeTest.ParsedNodeTest('node', '')
-         ppl = ParsedPredicateList.ParsedPredicateList([])
--        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
--        self._step = ParsedStep.ParsedStep(as, nt, ppl)
-+        as26 = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
-+        self._step = ParsedStep.ParsedStep(as26, nt, ppl)
-         return
- 
-     def evaluate(self, context):
diff --git a/textproc/py-xml/files/patch-xml-xpath-ParsedAbbreviatedRelativeLocationPath.py b/textproc/py-xml/files/patch-xml-xpath-ParsedAbbreviatedRelativeLocationPath.py
deleted file mode 100644
index c440b2455c24..000000000000
--- a/textproc/py-xml/files/patch-xml-xpath-ParsedAbbreviatedRelativeLocationPath.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- xml/xpath/ParsedAbbreviatedRelativeLocationPath.py.orig	2009-07-09 08:43:39.000000000 +0800
-+++ xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2009-07-09 08:43:56.000000000 +0800
-@@ -28,8 +28,8 @@
-         self._right = right
-         nt = ParsedNodeTest.ParsedNodeTest('node','')
-         ppl = ParsedPredicateList.ParsedPredicateList([])
--        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
--        self._middle = ParsedStep.ParsedStep(as, nt, ppl)
-+        as26 = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
-+        self._middle = ParsedStep.ParsedStep(as26, nt, ppl)
- 
-     def evaluate(self, context):
-         res = []
diff --git a/textproc/py-xml/files/patch-xml_xslt_Stylesheet.py b/textproc/py-xml/files/patch-xml_xslt_Stylesheet.py
deleted file mode 100644
index 3beb27feb6f8..000000000000
--- a/textproc/py-xml/files/patch-xml_xslt_Stylesheet.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- xml/xslt/Stylesheet.py.orig	2015-02-16 16:52:28 UTC
-+++ xml/xslt/Stylesheet.py
-@@ -373,8 +373,8 @@ class StylesheetElement(XsltElement):
- 
-         #Attribute sets
-         attribute_sets = filter(lambda x: x.nodeType == Node.ELEMENT_NODE and (x.namespaceURI, x.localName) == (XSL_NAMESPACE, 'attribute-set'), self.childNodes)
--        for as in attribute_sets:
--            as.instantiate(context, processor)
-+        for las in attribute_sets:
-+            las.instantiate(context, processor)
-         overridden_params = {}
-         for k in topLevelParams.keys():
-             if type(k) != types.TupleType:
diff --git a/textproc/py-xml/pkg-descr b/textproc/py-xml/pkg-descr
deleted file mode 100644
index 774523b113bc..000000000000
--- a/textproc/py-xml/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-PyXML is a collection of libraries to process XML with Python.
-It effectively extends and updates Python's built-in XML libraries
-(the xml.* modules). It contains, among other things:
-
-  xmlproc: a validating XML 1.0 parser written in Python
-  Expat:   a nonvalidating XML 1.0 parser written in C, plus Python bindings
-  PySAX:   SAX 1 and SAX2 libraries with drivers for most of the parsers
-  4DOM:    a compliant DOM Level 2 implementation written in Python
-  javadom: a Java-DOM-implementation-to-standard-Python-DOM adapter
-  pulldom: a DOM implementation that supports lazy instantiation of nodes
-  marshal: a module for serializing Python objects to XML formats including
-             WDDX and XML-RPC
-  sgmlop:  a C helper module that can speed up xmllib (deprecated) & sgmllib
-
-It also provides the latest updates/fixes for minidom (the default
-xml.dom.implementation), and includes an XPath 1.0 processor for minidom
-(xml.xpath). Experimental XSLT 1.0 support for minidom can be added if the
-port is installed with WITH_XSLT defined (e.g. "make install WITH_XSLT=yes").
-
-WWW: http://pyxml.sourceforge.net/
-     http://www.python.org/sigs/xml-sig/