3 files changed, 58 insertions, 22 deletions

diff --git a/devel/py-lxml/Makefile b/devel/py-lxml/Makefile
index 9ca8a01243c6..83039b16f472 100644
--- a/devel/py-lxml/Makefile
+++ b/devel/py-lxml/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	lxml
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2
 CATEGORIES=	devel python
-MASTER_SITES=	http://codespeak.net/lxml/
+MASTER_SITES=	http://codespeak.net/lxml/ \
+		http://cheeseshop.python.org/packages/source/l/lxml/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gogo@cs.uni-sb.de
 COMMENT=	Pythonic binding for the libxml2 and libxslt libraries
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		 xslt.2:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
+LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt
+RUN_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
 
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
@@ -29,6 +31,14 @@ BASEDOCS=	CHANGES.txt \
 		TODO.txt \
 		README.txt
 
+EASY_INSTALL_CMD?=	easy_install-${PYTHON_VER}
+
+PYLXML_EGG=	${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}-${OPSYS:L}-${OSRELEASE}-${ARCH}.egg
+
+PLIST_SUB+=	EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
+		PYLXML_EGG=${PYLXML_EGG} \
+		PYLXML_EGG_VER="${PORTNAME}==${PORTVERSION}"
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -39,4 +49,8 @@ post-install:
 	${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}/doc
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+OSRELEASE!=	${DESTDIR}/usr/bin/uname -r
+
+.include <bsd.port.post.mk>
diff --git a/devel/py-lxml/distinfo b/devel/py-lxml/distinfo
index a31394cfbf7d..7ace38e7aaff 100644
--- a/devel/py-lxml/distinfo
+++ b/devel/py-lxml/distinfo
@@ -1,3 +1,3 @@
-MD5 (lxml-1.1.2.tgz) = d18ecaacdecf7c9f02a6e9aecb16c720
-SHA256 (lxml-1.1.2.tgz) = b0139b3e1443ab5ce7dd2b63e67ac987f1e4caddf5f9bc72c90c63199265c278
-SIZE (lxml-1.1.2.tgz) = 640469
+MD5 (lxml-1.2.tgz) = d971fc4cb31dc7a18ee397b2f815e0b9
+SHA256 (lxml-1.2.tgz) = 1c381effa3294d4d4d9e8d9e118f57ba733c7046c1cb9a44ab2606ec6a44237d
+SIZE (lxml-1.2.tgz) = 674337
diff --git a/devel/py-lxml/pkg-plist b/devel/py-lxml/pkg-plist
index 409d4fbdfce6..3a5a09d5be5d 100644
--- a/devel/py-lxml/pkg-plist
+++ b/devel/py-lxml/pkg-plist
@@ -1,19 +1,42 @@
-%%PYTHON_SITELIBDIR%%/lxml/__init__.py
-%%PYTHON_SITELIBDIR%%/lxml/__init__.pyc
-%%PYTHON_SITELIBDIR%%/lxml/__init__.pyo
-%%PYTHON_SITELIBDIR%%/lxml/_elementpath.py
-%%PYTHON_SITELIBDIR%%/lxml/_elementpath.pyc
-%%PYTHON_SITELIBDIR%%/lxml/_elementpath.pyo
-%%PYTHON_SITELIBDIR%%/lxml/etree.so
-%%PYTHON_SITELIBDIR%%/lxml/objectify.so
-%%PYTHON_SITELIBDIR%%/lxml/sax.py
-%%PYTHON_SITELIBDIR%%/lxml/sax.pyc
-%%PYTHON_SITELIBDIR%%/lxml/sax.pyo
+@unexec %%EASY_INSTALL_CMD%% -q -m -S %D/%%PYTHON_SITELIBDIR%% %%PYLXML_EGG_VER%%
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/EGG-INFO/native_libs.txt
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/ElementInclude.py
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/ElementInclude.pyc
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/ElementInclude.pyo
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/_elementpath.py
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/_elementpath.pyc
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/_elementpath.pyo
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/elementlib.py
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/elementlib.pyc
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/elementlib.pyo
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/etree.py
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/etree.pyc
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/etree.pyo
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/etree.so
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/objectify.py
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/objectify.pyc
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/objectify.pyo
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/objectify.so
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/sax.py
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/sax.pyc
+%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/sax.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%
+@exec %%EASY_INSTALL_CMD%% -q -N -S %D/%%PYTHON_SITELIBDIR%% %%PYLXML_EGG_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSES.txt
-%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc/FAQ.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc/api.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc/build.txt
@@ -25,7 +48,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/api.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/build.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/capi.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/changes-1.1.2.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/changes-1.2.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/compatibility.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/element_classes.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/extensions.html
@@ -59,4 +82,3 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/doc/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/lxml