5 files changed, 6 insertions, 34 deletions

diff --git a/net-im/jabber-pyicq/Makefile b/net-im/jabber-pyicq/Makefile
index c0863c0b9c04..5f4da4772afb 100644
--- a/net-im/jabber-pyicq/Makefile
+++ b/net-im/jabber-pyicq/Makefile
@@ -5,10 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	pyicq
-PORTVERSION=	0.8a
-PORTREVISION=	2
+PORTVERSION=	0.8b
 CATEGORIES=	net-im
-MASTER_SITES=	http://www.blathersource.org/download.php/pyicq-t/
+MASTER_SITES=	http://pyicqt.googlecode.com/files/
 PKGNAMEPREFIX=	jabber-
 PKGNAMESUFFIX=	-transport
 DISTNAME=	${PORTNAME}-t-${PORTVERSION}
@@ -96,7 +95,6 @@ post-patch:
 		${WRKSRC}/src/main.py
 	@${REINPLACE_CMD} -i "" 's|^#!.*$$|#!${LOCAL_PYTHON}|' \
 		${WRKSRC}/PyICQt.py
-	@${RM} -f ${WRKSRC}/src/main.py.orig ${WRKSRC}/src/legacy/icqt.py.orig
 
 do-install:
 	@${MKDIR} ${INST_DIR}/src ${INST_DIR}/data
diff --git a/net-im/jabber-pyicq/distinfo b/net-im/jabber-pyicq/distinfo
index c35c3351006c..176cfb447de9 100644
--- a/net-im/jabber-pyicq/distinfo
+++ b/net-im/jabber-pyicq/distinfo
@@ -1,3 +1,3 @@
-MD5 (jabber/pyicq-t-0.8a.tar.gz) = eb44605d5f952759e3cba19815d367d2
-SHA256 (jabber/pyicq-t-0.8a.tar.gz) = e4312a289131a548307ebee87b1ace49d3a15ab378817078d7e1aa8e48f01083
-SIZE (jabber/pyicq-t-0.8a.tar.gz) = 163112
+MD5 (jabber/pyicq-t-0.8b.tar.gz) = 961952be1f88d0b97bc7cc36c75d1215
+SHA256 (jabber/pyicq-t-0.8b.tar.gz) = 83e9b6cbd886e88c674e464f61b1b35becb4c81ab1e7cda5ed1f4ba32bd25a09
+SIZE (jabber/pyicq-t-0.8b.tar.gz) = 164765
diff --git a/net-im/jabber-pyicq/files/patch-src_legacy_icqt.py b/net-im/jabber-pyicq/files/patch-src_legacy_icqt.py
deleted file mode 100644
index b16bf791a92d..000000000000
--- a/net-im/jabber-pyicq/files/patch-src_legacy_icqt.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/legacy/icqt.py.orig	2008-01-09 04:58:42.000000000 +0100
-+++ src/legacy/icqt.py	2008-01-13 08:06:51.411126927 +0100
-@@ -327,7 +327,8 @@
- 					status = msg[0] + ": " + status
- 
- 			status = status.decode(charset, 'replace')
--			LogEvent(INFO, self.session.jabberID, "Away (%s, %s) message %s" % (charset, msg[0], status))
-+			utfmsg = unicode(msg[0], errors='replace')
-+			LogEvent(INFO, self.session.jabberID, "Away (%s, %s) message %s" % (charset, utfmsg[0], status))
- 
- 		if status == "Away" or status=="I am currently away from the computer." or status=="I am away from my computer right now.":
- 			status = ""
diff --git a/net-im/jabber-pyicq/files/patch-src_main.py b/net-im/jabber-pyicq/files/patch-src_main.py
deleted file mode 100644
index 5bff1b8f8fc2..000000000000
--- a/net-im/jabber-pyicq/files/patch-src_main.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/main.py.orig	Sat Sep 30 16:44:21 2006
-+++ src/main.py	Sun Jan 14 19:52:36 2007
-@@ -89,7 +89,10 @@
- 	import signal
- 	signal.signal(signal.SIGHUP, reloadConfig)
- 	# Load scripts for PID and daemonizing
--	from twisted.scripts import twistd
-+	try:
-+		from twisted.scripts import _twistd_unix as twistd
-+	except:
-+		from twisted.scripts import twistd
- 
- selectWarning = "Unable to install any good reactors (kqueue, cf, epoll, poll).\nWe fell back to using select. You may have scalability problems.\nThis reactor will not support more than 1024 connections +at a time.  You may silence this message by choosing 'select' or 'default' as your reactor in the transport config."
- if config.reactor and len(config.reactor) > 0:
diff --git a/net-im/jabber-pyicq/pkg-descr b/net-im/jabber-pyicq/pkg-descr
index 6c502f66c733..9fef31cfc66e 100644
--- a/net-im/jabber-pyicq/pkg-descr
+++ b/net-im/jabber-pyicq/pkg-descr
@@ -5,4 +5,4 @@ ICQ via their Jabber account. It is implemented in Python, using the Twisted
 framework. This project is just getting off the ground, and so it does not have
 quite the functionality of other transports yet. That will come in time.
 
-WWW: http://pyicq-t.blathersource.org/
+WWW: http://code.google.com/p/pyicqt/