- Update to 0.8: now it works fine with twisted 2.4.0

3 files changed, 50 insertions, 19 deletions

diff --git a/net-im/jabber-pyicq/Makefile b/net-im/jabber-pyicq/Makefile
index bc30787..03b3ecf 100644
--- a/net-im/jabber-pyicq/Makefile
+++ b/net-im/jabber-pyicq/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	pyicq
-PORTVERSION=	0.7b
-PORTREVISION=	2
+PORTVERSION=	0.8
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.blathersource.org/download.php/pyicq-t/
 PKGNAMEPREFIX=	jabber-
diff --git a/net-im/jabber-pyicq/distinfo b/net-im/jabber-pyicq/distinfo
index 18b3055..fe9b940 100644
--- a/net-im/jabber-pyicq/distinfo
+++ b/net-im/jabber-pyicq/distinfo
@@ -1,3 +1,3 @@
-MD5 (jabber/pyicq-t-0.7b.tar.gz) = 7de0df9311eb6923e6f59fdd914bb6ab
-SHA256 (jabber/pyicq-t-0.7b.tar.gz) = abb0827d4711d361fdbba64181e21ceb2325d336ce95c5c67e3b1b5bec3b4dd2
-SIZE (jabber/pyicq-t-0.7b.tar.gz) = 139959
+MD5 (jabber/pyicq-t-0.8.tar.gz) = 0929aa4b726d8718e1b8c8cb900fa114
+SHA256 (jabber/pyicq-t-0.8.tar.gz) = ef914750f07ba74437230cd626a6248ff6a5d7b3fe777b2df3a8be8741c3f811
+SIZE (jabber/pyicq-t-0.8.tar.gz) = 163250
diff --git a/net-im/jabber-pyicq/pkg-plist b/net-im/jabber-pyicq/pkg-plist
index 8a59464..c55bd94 100644
--- a/net-im/jabber-pyicq/pkg-plist
+++ b/net-im/jabber-pyicq/pkg-plist
@@ -5,15 +5,16 @@
 lib/jabber/pyicq/PyICQt.py
 lib/jabber/pyicq/data/defaultAIMAvatar.png
 lib/jabber/pyicq/data/defaultICQAvatar.png
+lib/jabber/pyicq/src/adhoc.py
 lib/jabber/pyicq/src/avatar.py
 lib/jabber/pyicq/src/bool.py
 lib/jabber/pyicq/src/config.py
 lib/jabber/pyicq/src/contact.py
-lib/jabber/pyicq/src/daemonize.py
 lib/jabber/pyicq/src/debug.py
 lib/jabber/pyicq/src/disco.py
 lib/jabber/pyicq/src/globals.py
 lib/jabber/pyicq/src/imgmanip.py
+lib/jabber/pyicq/src/iq.py
 lib/jabber/pyicq/src/jabw.py
 lib/jabber/pyicq/src/lang.py
 lib/jabber/pyicq/src/langs/sv.py
@@ -27,31 +28,56 @@ lib/jabber/pyicq/src/langs/pl.py
 lib/jabber/pyicq/src/langs/ru.py
 lib/jabber/pyicq/src/langs/__init__.py
 lib/jabber/pyicq/src/legacy/__init__.py
+lib/jabber/pyicq/src/legacy/buddies.py
 lib/jabber/pyicq/src/legacy/glue.py
 lib/jabber/pyicq/src/legacy/icqt.py
-lib/jabber/pyicq/src/legacy/legacyiq.py
-lib/jabber/pyicq/src/legacy/legacylist.py
+lib/jabber/pyicq/src/legacy/services/__init__.py
+lib/jabber/pyicq/src/legacy/services/ConfirmAccount.py
+lib/jabber/pyicq/src/legacy/services/EmailLookup.py
 lib/jabber/pyicq/src/main.py
-lib/jabber/pyicq/src/misciq.py
+lib/jabber/pyicq/src/pubsub.py
 lib/jabber/pyicq/src/register.py
 lib/jabber/pyicq/src/sasl.py
+lib/jabber/pyicq/src/services/__init__.py
+lib/jabber/pyicq/src/services/ConnectUsers.py
+lib/jabber/pyicq/src/services/EntityTime.py
+lib/jabber/pyicq/src/services/GatewayTranslator.py
+lib/jabber/pyicq/src/services/IqAvatarFactory.py
+lib/jabber/pyicq/src/services/LastActivity.py
+lib/jabber/pyicq/src/services/PingService.py
+lib/jabber/pyicq/src/services/RosterRetrieval.py
+lib/jabber/pyicq/src/services/SearchFactory.py
+lib/jabber/pyicq/src/services/Statistics.py
+lib/jabber/pyicq/src/services/VCardFactory.py
+lib/jabber/pyicq/src/services/VersionTeller.py
 lib/jabber/pyicq/src/session.py
+lib/jabber/pyicq/src/svninfo.py
 lib/jabber/pyicq/src/tlib/__init__.py
 lib/jabber/pyicq/src/tlib/countrycodes.py
-lib/jabber/pyicq/src/tlib/domish.py
-lib/jabber/pyicq/src/tlib/jabber/__init__.py
-lib/jabber/pyicq/src/tlib/jabber/client.py
-lib/jabber/pyicq/src/tlib/jabber/component.py
-lib/jabber/pyicq/src/tlib/jabber/jid.py
-lib/jabber/pyicq/src/tlib/jabber/jstrports.py
-lib/jabber/pyicq/src/tlib/jabber/xmpp_stringprep.py
+lib/jabber/pyicq/src/tlib/httpcompat.py
+lib/jabber/pyicq/src/tlib/ifcompat.py
 lib/jabber/pyicq/src/tlib/langcodes.py
 lib/jabber/pyicq/src/tlib/oscar.py
 lib/jabber/pyicq/src/tlib/scheduler.py
 lib/jabber/pyicq/src/tlib/socks5.py
 lib/jabber/pyicq/src/tlib/sockserror.py
-lib/jabber/pyicq/src/tlib/twistwrap.py
-lib/jabber/pyicq/src/tlib/xmlstream.py
+lib/jabber/pyicq/src/twistfix/__init__.py
+lib/jabber/pyicq/src/twistfix/README
+lib/jabber/pyicq/src/twistfix/version.py
+lib/jabber/pyicq/src/twistfix/words/__init__.py
+lib/jabber/pyicq/src/twistfix/words/protocols/__init__.py
+lib/jabber/pyicq/src/twistfix/words/protocols/jabber/__init__.py
+lib/jabber/pyicq/src/twistfix/words/protocols/jabber/client.py
+lib/jabber/pyicq/src/twistfix/words/protocols/jabber/component.py
+lib/jabber/pyicq/src/twistfix/words/protocols/jabber/jid.py
+lib/jabber/pyicq/src/twistfix/words/protocols/jabber/jstrports.py
+lib/jabber/pyicq/src/twistfix/words/protocols/jabber/xmpp_stringprep.py
+lib/jabber/pyicq/src/twistfix/words/xish/__init__.py
+lib/jabber/pyicq/src/twistfix/words/xish/domish.py
+lib/jabber/pyicq/src/twistfix/words/xish/utility.py
+lib/jabber/pyicq/src/twistfix/words/xish/xmlstream.py
+lib/jabber/pyicq/src/twistfix/words/xish/xpath.py
+lib/jabber/pyicq/src/twistfix/words/xish/xpathparser.py
 lib/jabber/pyicq/src/utils.py
 lib/jabber/pyicq/src/web/__init__.py
 lib/jabber/pyicq/src/web/handler.py
@@ -64,8 +90,14 @@ lib/jabber/pyicq/src/xdb/template.py
 lib/jabber/pyicq/src/xdb/xmlfiles.py
 lib/jabber/pyicq/src/xmlconfig.py
 @dirrm lib/jabber/pyicq/src/langs
+@dirrm lib/jabber/pyicq/src/legacy/services
 @dirrm lib/jabber/pyicq/src/legacy
-@dirrm lib/jabber/pyicq/src/tlib/jabber
+@dirrm lib/jabber/pyicq/src/services
+@dirrm lib/jabber/pyicq/src/twistfix/words/xish
+@dirrm lib/jabber/pyicq/src/twistfix/words/protocols/jabber
+@dirrm lib/jabber/pyicq/src/twistfix/words/protocols
+@dirrm lib/jabber/pyicq/src/twistfix/words
+@dirrm lib/jabber/pyicq/src/twistfix
 @dirrm lib/jabber/pyicq/src/tlib
 @dirrm lib/jabber/pyicq/src/web
 @dirrm lib/jabber/pyicq/src/xdb