--- Makefile.orig	2009-01-21 23:53:35.000000000 +0800
+++ Makefile	2009-01-22 00:13:52.000000000 +0800
@@ -6,29 +6,22 @@
 #
 
 PORTNAME=	pyxmpp
-PORTVERSION=	1.0.0.664
+PORTVERSION=	1.0.1
 CATEGORIES=	net-im python
-MASTER_SITES=	CENKES http://jabberstudio.2nw.net/pyxmpp/
+MASTER_SITES=	http://pyxmpp.jajcus.net/downloads/ \
+		CENKES http://jabberstudio.2nw.net/pyxmpp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-# svn export -r664 http://pyxmpp.jajcus.net/svn/pyxmpp/trunk pyxmpp
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A Python XMPP library
 
 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}
+		${PYTHON_PKGNAMEPREFIX}m2crypto>=0.18.2:${PORTSDIR}/security/py-m2crypto
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PYTHON=	2.3+
-#USE_PYDISTUTILS=	yes
-USE_BZIP2=	yes
-
-INSTALLS_EGGINFO=	yes
-PYDISTUTILS_PKGVERSION=	1.0.0_svn
-
-post-extract:
-	@${MKDIR} ${WRKSRC}/.svn
+USE_PYDISTUTILS=	yes
 
 post-patch:
 	@${GREP} -lr '/usr/bin/python' ${WRKSRC} | \
--- distinfo.orig	2009-01-21 23:53:35.000000000 +0800
+++ distinfo	2009-01-21 23:53:35.000000000 +0800
@@ -1,3 +1,3 @@
-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
+MD5 (pyxmpp-1.0.1.tar.gz) = b2287c1a63b1c7e5f8036d008ded7310
+SHA256 (pyxmpp-1.0.1.tar.gz) = f0a531b11fe34126617351cc8751dd5dd8831f447e2aea38ce32ac25a7748067
+SIZE (pyxmpp-1.0.1.tar.gz) = 1070143
--- pkg-plist.orig	2009-01-21 23:53:35.000000000 +0800
+++ pkg-plist	2009-01-21 23:53:35.000000000 +0800
@@ -47,6 +47,18 @@
 %%PYTHON_SITELIBDIR%%/pyxmpp/jabber/simple.pyc
 %%PYTHON_SITELIBDIR%%/pyxmpp/jabber/vcard.py
 %%PYTHON_SITELIBDIR%%/pyxmpp/jabber/vcard.pyc
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/all.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/client.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/clientstream.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/dataforms.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/delay.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/disco.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/muc.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/muccore.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/register.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/simple.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabber/vcard.pyo
 %%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/__init__.py
 %%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/all.py
@@ -55,6 +67,10 @@
 %%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/component.pyc
 %%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/componentstream.py
 %%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/componentstream.pyc
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/all.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/component.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jabberd/componentstream.pyo
 %%PYTHON_SITELIBDIR%%/pyxmpp/jid.py
 %%PYTHON_SITELIBDIR%%/pyxmpp/jid.pyc
 %%PYTHON_SITELIBDIR%%/pyxmpp/message.py
@@ -75,6 +91,13 @@
 %%PYTHON_SITELIBDIR%%/pyxmpp/sasl/digest_md5.pyc
 %%PYTHON_SITELIBDIR%%/pyxmpp/sasl/plain.py
 %%PYTHON_SITELIBDIR%%/pyxmpp/sasl/plain.pyc
+%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/core.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/digest_md5.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/gssapi.py
+%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/gssapi.pyc
+%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/gssapi.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/sasl/plain.pyo
 %%PYTHON_SITELIBDIR%%/pyxmpp/stanza.py
 %%PYTHON_SITELIBDIR%%/pyxmpp/stanza.pyc
 %%PYTHON_SITELIBDIR%%/pyxmpp/stanzaprocessor.py
@@ -95,6 +118,34 @@
 %%PYTHON_SITELIBDIR%%/pyxmpp/xmlextra.pyc
 %%PYTHON_SITELIBDIR%%/pyxmpp/xmppstringprep.py
 %%PYTHON_SITELIBDIR%%/pyxmpp/xmppstringprep.pyc
+%%PYTHON_SITELIBDIR%%/pyxmpp/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/all.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/cache.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/client.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/clientstream.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/error.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/expdict.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/interface.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/interface_micro_impl.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/interfaces.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/iq.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/jid.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/message.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/objects.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.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/stream.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/streambase.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/streamsasl.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/streamtls.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/utils.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/version.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/xmlextra.pyo
+%%PYTHON_SITELIBDIR%%/pyxmpp/xmppstringprep.pyo
 %%PYTHON_SITELIBDIR%%/pyxmpp.pth
 @dirrm %%PYTHON_SITELIBDIR%%/pyxmpp/jabber
 @dirrm %%PYTHON_SITELIBDIR%%/pyxmpp/jabberd