2 files changed, 4 insertions, 162 deletions

diff --git a/net-im/py-pyxmpp/Makefile b/net-im/py-pyxmpp/Makefile
index 672977213291..ff116180d371 100644
--- a/net-im/py-pyxmpp/Makefile
+++ b/net-im/py-pyxmpp/Makefile
@@ -3,22 +3,23 @@
 
 PORTNAME=	pyxmpp
 PORTVERSION=	1.1.2
+PORTREVISION=	yes
 CATEGORIES=	net-im python
 MASTER_SITES=	http://cloud.github.com/downloads/Jajcus/pyxmpp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Python XMPP library
+COMMENT=	Python XMPP library
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython \
 		${PYTHON_PKGNAMEPREFIX}m2crypto>=0.18.2:${PORTSDIR}/security/py-m2crypto \
 		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PYTHON=	2.6+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${GREP} -lR "/usr/bin/python" ${WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -e "s|/usr/bin/python|${PYTHON_CMD}|"
@@ -26,7 +27,4 @@ post-patch:
 		"/include_dirs =/s|\[.*|['${LOCALBASE}/include/libxml2','${LOCALBASE}/include']| ; \
 		 /library_dirs =/s|\[.*|['${LOCALBASE}/lib']|" ${WRKSRC}/setup.py
 
-post-install:
-	@${ECHO_CMD} "pyxmpp" > ${PYTHON_SITELIBDIR}/pyxmpp.pth
-
 .include <bsd.port.mk>
diff --git a/net-im/py-pyxmpp/pkg-plist b/net-im/py-pyxmpp/pkg-plist
deleted file mode 100644
index b3b79b817058..000000000000
--- a/net-im/py-pyxmpp/pkg-plist
+++ /dev/null
@@ -1,156 +0,0 @@
-%%PYTHON_SITELIBDIR%%/pyxmpp.pth
-%%PYTHON_SITELIBDIR%%/pyxmpp/__init__.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/_xmlextra.so
-%%PYTHON_SITELIBDIR%%/pyxmpp/all.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/all.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/all.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/cache.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/cache.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/cache.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/client.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/client.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/client.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/clientstream.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/clientstream.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/clientstream.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/error.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/error.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/error.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/exceptions.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/expdict.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/expdict.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/expdict.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/interface.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/interface.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/interface.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/interface_micro_impl.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/interface_micro_impl.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/interface_micro_impl.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/interfaces.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/iq.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/iq.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/iq.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/__init__.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/all.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/all.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/all.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/client.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/client.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/client.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/clientstream.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/clientstream.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/clientstream.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/dataforms.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/dataforms.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/dataforms.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/delay.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/delay.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/delay.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/disco.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/disco.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/disco.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/muc.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/muc.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/muc.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/muccore.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/muccore.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/muccore.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/register.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/register.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/register.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/simple.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/simple.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/simple.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/vcard.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/vcard.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/vcard.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/__init__.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/all.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/all.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/all.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/component.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/component.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/component.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/componentstream.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/componentstream.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/componentstream.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jid.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jid.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jid.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/message.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/message.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/message.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/objects.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/objects.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/objects.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/presence.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/presence.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/presence.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/resolver.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/resolver.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/resolver.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/roster.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/roster.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/roster.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/__init__.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/core.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/core.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/core.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/digest_md5.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/digest_md5.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/digest_md5.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/external.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/external.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/external.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/gssapi.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/gssapi.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/gssapi.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/plain.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/plain.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/plain.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/stanza.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/stanza.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/stanza.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/stanzaprocessor.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/stanzaprocessor.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/stanzaprocessor.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/stream.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/stream.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/stream.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/streambase.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/streambase.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/streambase.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/streamsasl.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/streamsasl.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/streamsasl.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/streamtls.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/streamtls.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/streamtls.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/utils.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/utils.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/utils.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/version.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/version.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/version.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/xmlextra.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/xmlextra.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/xmlextra.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/xmppstringprep.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/xmppstringprep.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/xmppstringprep.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/pyxmpp/sasl
-@dirrm %%PYTHON_SITELIBDIR%%/pyxmpp/jabberd
-@dirrm %%PYTHON_SITELIBDIR%%/pyxmpp/jabber
-@dirrm %%PYTHON_SITELIBDIR%%/pyxmpp