4 files changed, 127 insertions, 85 deletions

diff --git a/net-im/py-pyxmpp/Makefile b/net-im/py-pyxmpp/Makefile
index d50199e8d621..8447b7721c6c 100644
--- a/net-im/py-pyxmpp/Makefile
+++ b/net-im/py-pyxmpp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pyxmpp
-PORTVERSION=	0.5
+PORTVERSION=	1.0.0
 CATEGORIES=	net-im python
 MASTER_SITES=	http://jabberstudio.2nw.net/pyxmpp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,12 +14,18 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Python XMPP library
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2:install
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
+		${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython \
+		${PYTHON_SITELIBDIR}/M2Crypto/__init__.py:${PORTSDIR}/security/py-m2crypto
 
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
 
+post-patch:
+	@${GREP} -lr '/usr/bin/python' ${WRKSRC} | \
+		${XARGS} ${REINPLACE_CMD} -e "s!/usr/bin/python!${PYTHON_CMD}!"
+
 post-install:
 	@${ECHO} "pyxmpp" > ${PYTHON_SITELIBDIR}/pyxmpp.pth
 
diff --git a/net-im/py-pyxmpp/distinfo b/net-im/py-pyxmpp/distinfo
index 5f90722ea8cc..503e48e01642 100644
--- a/net-im/py-pyxmpp/distinfo
+++ b/net-im/py-pyxmpp/distinfo
@@ -1,3 +1,3 @@
-MD5 (pyxmpp-0.5.tar.gz) = 5eae50288bf59bba008f81f47651b9b6
-SHA256 (pyxmpp-0.5.tar.gz) = 8dd0bc5e7ae40a0abc4df591c4fa40cd7a8f66ba03758118503ae4a0009649cf
-SIZE (pyxmpp-0.5.tar.gz) = 78470
+MD5 (pyxmpp-1.0.0.tar.gz) = 02700da5a2f36b57916e9da200d2c14f
+SHA256 (pyxmpp-1.0.0.tar.gz) = 924ba0cde1e630b53784623cdaab35f0da6e81e7b8a11e6927cd38420a781267
+SIZE (pyxmpp-1.0.0.tar.gz) = 669021
diff --git a/net-im/py-pyxmpp/files/patch-setup.py b/net-im/py-pyxmpp/files/patch-setup.py
index 00117a8599ae..0e4b24ffa636 100644
--- a/net-im/py-pyxmpp/files/patch-setup.py
+++ b/net-im/py-pyxmpp/files/patch-setup.py
@@ -1,12 +1,13 @@
---- setup.py.orig	Fri Mar  4 16:06:45 2005
-+++ setup.py	Fri Mar  4 16:07:37 2005
-@@ -32,7 +32,8 @@
-             'ext/xmlextra.c',
-             ],
-             libraries =     ['xml2'],
--            include_dirs =  ['libxml2addon','/usr/include/libxml2','/usr/local/include/libxml2'],
-+            include_dirs =  ['libxml2addon','/usr/include/libxml2','/usr/local/include/libxml2','/usr/local/include'],
-+            library_dirs = ['/usr/local/lib'],
-             extra_compile_args = ['-g2'],
-         ),
-     ],
+--- ./setup.py.orig	Wed Apr 19 18:58:34 2006
++++ ./setup.py	Wed Apr 19 18:59:59 2006
+@@ -26,8 +26,8 @@
+         include_dirs = [r'd:\libs\include', r'd:\libs\include\libxml']
+         library_dirs = [r'd:\libs\lib']
+     else:
+-        include_dirs = ['/usr/include/libxml2','/usr/local/include/libxml2']
+-        library_dirs = []
++        include_dirs = ['/usr/include/libxml2','/usr/local/include/libxml2','/usr/local/include']
++        library_dirs = ['/usr/local/lib']
+     ext_modules = [
+         Extension(
+             'pyxmpp._xmlextra',
diff --git a/net-im/py-pyxmpp/pkg-plist b/net-im/py-pyxmpp/pkg-plist
index b453239edf1a..8e8528dfbad1 100644
--- a/net-im/py-pyxmpp/pkg-plist
+++ b/net-im/py-pyxmpp/pkg-plist
@@ -1,103 +1,138 @@
-%%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/dns.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/expdict.py
+%%PYTHON_SITELIBDIR%%/pyxmpp/expdict.pyc
+%%PYTHON_SITELIBDIR%%/pyxmpp/expdict.pyo
 %%PYTHON_SITELIBDIR%%/pyxmpp/iq.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jid.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/message.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/presence.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/resolver.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/roster.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/stanza.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/stream.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/utils.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/version.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/xmlextra.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/xmppstringprep.py
+%%PYTHON_SITELIBDIR%%/pyxmpp/iq.pyc
+%%PYTHON_SITELIBDIR%%/pyxmpp/iq.pyo
 %%PYTHON_SITELIBDIR%%/pyxmpp/jabber/__init__.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/client.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/clientstream.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/delay.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/disco.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/muc.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/vcard.py
 %%PYTHON_SITELIBDIR%%/pyxmpp/jabber/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/client.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/clientstream.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/delay.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/disco.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/muc.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/vcard.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/component.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/componentstream.py
 %%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/component.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/componentstream.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/core.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/digest_md5.py
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/plain.py
 %%PYTHON_SITELIBDIR%%/pyxmpp/sasl/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/core.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/digest_md5.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/plain.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/plain.py
+%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/plain.pyc
 %%PYTHON_SITELIBDIR%%/pyxmpp/sasl/plain.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/_xmlextra.so
-%%PYTHON_SITELIBDIR%%/pyxmpp/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/client.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/clientstream.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/dns.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/error.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/expdict.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/iq.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/jid.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/message.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/presence.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/resolver.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/roster.pyc
+%%PYTHON_SITELIBDIR%%/pyxmpp/stanza.py
 %%PYTHON_SITELIBDIR%%/pyxmpp/stanza.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/stream.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/utils.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/version.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/xmlextra.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/xmppstringprep.pyc
-%%PYTHON_SITELIBDIR%%/pyxmpp/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/client.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/clientstream.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/dns.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/error.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/expdict.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/iq.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/jid.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/message.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/presence.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/resolver.pyo
-%%PYTHON_SITELIBDIR%%/pyxmpp/roster.pyo
 %%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
-
+%%PYTHON_SITELIBDIR%%/pyxmpp.pth
+@dirrm %%PYTHON_SITELIBDIR%%/pyxmpp/jabber
 @dirrm %%PYTHON_SITELIBDIR%%/pyxmpp/jabberd
 @dirrm %%PYTHON_SITELIBDIR%%/pyxmpp/sasl
-@dirrm %%PYTHON_SITELIBDIR%%/pyxmpp/jabber
 @dirrm %%PYTHON_SITELIBDIR%%/pyxmpp