5 files changed, 25 insertions, 67 deletions

diff --git a/net-im/py-pyxmpp/Makefile b/net-im/py-pyxmpp/Makefile
index 8447b7721c6c..80d0fcbeeb95 100644
--- a/net-im/py-pyxmpp/Makefile
+++ b/net-im/py-pyxmpp/Makefile
@@ -6,25 +6,32 @@
 #
 
 PORTNAME=	pyxmpp
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.0.664
 CATEGORIES=	net-im python
-MASTER_SITES=	http://jabberstudio.2nw.net/pyxmpp/
+MASTER_SITES=	CSME http://jabberstudio.2nw.net/pyxmpp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+# svn export -r664 http://pyxmpp.jajcus.net/svn/pyxmpp/trunk pyxmpp
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A Python XMPP library
 
-BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
+BUILD_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
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PYTHON=	2.3+
-USE_PYDISTUTILS=	yes
+#USE_PYDISTUTILS=	yes
+USE_BZIP2=	yes
+
+post-extract:
+	@${MKDIR} ${WRKSRC}/.svn
 
 post-patch:
 	@${GREP} -lr '/usr/bin/python' ${WRKSRC} | \
 		${XARGS} ${REINPLACE_CMD} -e "s!/usr/bin/python!${PYTHON_CMD}!"
+	@${REINPLACE_CMD} -e '/include_dirs =/s|]|,"${LOCALBASE}/include"]|' \
+		-e '/library_dirs =/s|]|"${LOCALBASE}/lib"]|' ${WRKSRC}/setup.py
 
 post-install:
 	@${ECHO} "pyxmpp" > ${PYTHON_SITELIBDIR}/pyxmpp.pth
diff --git a/net-im/py-pyxmpp/distinfo b/net-im/py-pyxmpp/distinfo
index 503e48e01642..235d27f03a53 100644
--- a/net-im/py-pyxmpp/distinfo
+++ b/net-im/py-pyxmpp/distinfo
@@ -1,3 +1,3 @@
-MD5 (pyxmpp-1.0.0.tar.gz) = 02700da5a2f36b57916e9da200d2c14f
-SHA256 (pyxmpp-1.0.0.tar.gz) = 924ba0cde1e630b53784623cdaab35f0da6e81e7b8a11e6927cd38420a781267
-SIZE (pyxmpp-1.0.0.tar.gz) = 669021
+MD5 (pyxmpp-1.0.0.664.tar.bz2) = 4b63536acaf740652503d5dd65934aa4
+SHA256 (pyxmpp-1.0.0.664.tar.bz2) = 4e90aa130dbcfeabf100fbe81e267d81d17f678e2c39bee07e9fae680a8cf517
+SIZE (pyxmpp-1.0.0.664.tar.bz2) = 147579
diff --git a/net-im/py-pyxmpp/files/patch-setup.py b/net-im/py-pyxmpp/files/patch-setup.py
deleted file mode 100644
index 0e4b24ffa636..000000000000
--- a/net-im/py-pyxmpp/files/patch-setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./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-descr b/net-im/py-pyxmpp/pkg-descr
index cdd2233bb4f5..b2e3809fed8c 100644
--- a/net-im/py-pyxmpp/pkg-descr
+++ b/net-im/py-pyxmpp/pkg-descr
@@ -8,4 +8,4 @@ blocks for creating Jabber clients and components. Developer
 uses them to setup XMPP streams, handle incoming events and
 create outgoing stanzas (XMPP "packets").
 
-WWW: http://pyxmpp.jabberstudio.org/
+WWW: http://pyxmpp.jajcus.net/
diff --git a/net-im/py-pyxmpp/pkg-plist b/net-im/py-pyxmpp/pkg-plist
index 8e8528dfbad1..90cce3df3db3 100644
--- a/net-im/py-pyxmpp/pkg-plist
+++ b/net-im/py-pyxmpp/pkg-plist
@@ -1,136 +1,100 @@
 %%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/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_micro_impl.py
+%%PYTHON_SITELIBDIR%%/pyxmpp/interface_micro_impl.pyc
+%%PYTHON_SITELIBDIR%%/pyxmpp/interfaces.py
+%%PYTHON_SITELIBDIR%%/pyxmpp/interfaces.pyc
 %%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/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
 %%PYTHON_SITELIBDIR%%/pyxmpp.pth
 @dirrm %%PYTHON_SITELIBDIR%%/pyxmpp/jabber
 @dirrm %%PYTHON_SITELIBDIR%%/pyxmpp/jabberd