3 files changed, 65 insertions, 69 deletions

diff --git a/net-im/py-pyxmpp/Makefile b/net-im/py-pyxmpp/Makefile
index 76bc512e17d8..4a54f99aee70 100644
--- a/net-im/py-pyxmpp/Makefile
+++ b/net-im/py-pyxmpp/Makefile
@@ -6,34 +6,30 @@
 #
 
 PORTNAME=	pyxmpp
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.1.2
 CATEGORIES=	net-im python
-MASTER_SITES=	http://pyxmpp.jajcus.net/downloads/ \
-		CENKES http://jabberstudio.2nw.net/pyxmpp/
+MASTER_SITES=	http://cloud.github.com/downloads/Jajcus/pyxmpp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Python XMPP library
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2011-09-01
+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}
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
-		${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython \
-		${PYTHON_PKGNAMEPREFIX}m2crypto>=0.18.2:${PORTSDIR}/security/py-m2crypto
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-USE_PYTHON=	2.5+
+USE_PYTHON=	2.6+
 USE_PYDISTUTILS=	yes
 
 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"]|' \
-		-e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/setup.py
+	@${GREP} -lR "/usr/bin/python" ${WRKSRC} | ${XARGS} \
+		${REINPLACE_CMD} -e "s|/usr/bin/python|${PYTHON_CMD}|"
+	@${REINPLACE_CMD} -e \
+		"/include_dirs =/s|\[.*|['${LOCALBASE}/include/libxml2','${LOCALBASE}/include']| ; \
+		 /library_dirs =/s|\[.*|['${LOCALBASE}/lib']|" ${WRKSRC}/setup.py
+
 post-install:
-	@${ECHO} "pyxmpp" > ${PYTHON_SITELIBDIR}/pyxmpp.pth
+	@${ECHO_CMD} "pyxmpp" > ${PYTHON_SITELIBDIR}/pyxmpp.pth
 
 .include <bsd.port.mk>
diff --git a/net-im/py-pyxmpp/distinfo b/net-im/py-pyxmpp/distinfo
index 5814f7c938d6..5aa526d77768 100644
--- a/net-im/py-pyxmpp/distinfo
+++ b/net-im/py-pyxmpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pyxmpp-1.1.1.tar.gz) = 1c021f781276831046e6ed2a31c1158e2900f1a36662b0ad497e29722374dcf6
-SIZE (pyxmpp-1.1.1.tar.gz) = 1076493
+SHA256 (pyxmpp-1.1.2.tar.gz) = f45365bae922a9e44226622cf086e3ffd3c681012f6c6b609d3306e4d0dfb33c
+SIZE (pyxmpp-1.1.2.tar.gz) = 1110893
diff --git a/net-im/py-pyxmpp/pkg-plist b/net-im/py-pyxmpp/pkg-plist
index 33251b676cdf..b3b79b817058 100644
--- a/net-im/py-pyxmpp/pkg-plist
+++ b/net-im/py-pyxmpp/pkg-plist
@@ -1,156 +1,156 @@
+%%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/__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/__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/__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/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/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.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/__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
 @dirrm %%PYTHON_SITELIBDIR%%/pyxmpp/sasl
+@dirrm %%PYTHON_SITELIBDIR%%/pyxmpp/jabberd
+@dirrm %%PYTHON_SITELIBDIR%%/pyxmpp/jabber
 @dirrm %%PYTHON_SITELIBDIR%%/pyxmpp