3 files changed, 53 insertions, 24 deletions

diff --git a/net-im/telepathy-butterfly/Makefile b/net-im/telepathy-butterfly/Makefile
index f7435b22dcf7..b7be3fc5cc06 100644
--- a/net-im/telepathy-butterfly/Makefile
+++ b/net-im/telepathy-butterfly/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	telepathy-butterfly
-PORTVERSION=	0.1.4
-PORTREVISION=	1
+PORTVERSION=	0.3.1
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,9 +16,10 @@ COMMENT=	MSN Connection Manager for Telepathy Framework
 
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/pymsn/__init__.py:${PORTSDIR}/net-im/pymsn \
 		${PYTHON_SITELIBDIR}/telepathy/__init__.py:${PORTSDIR}/net-im/telepathy-python
-RUN_DEPENDS+=	${BUILD_DEPENDS}
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pymsn/__init__.py:${PORTSDIR}/net-im/pymsn \
+    		${PYTHON_SITELIBDIR}/telepathy/__init__.py:${PORTSDIR}/net-im/telepathy-python
 
 USE_PYTHON=	2.4+
-USE_PYDISTUTILS=	yes
+HAS_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/net-im/telepathy-butterfly/distinfo b/net-im/telepathy-butterfly/distinfo
index 8dca33c5898a..b1bb465a01eb 100644
--- a/net-im/telepathy-butterfly/distinfo
+++ b/net-im/telepathy-butterfly/distinfo
@@ -1,3 +1,3 @@
-MD5 (telepathy-butterfly-0.1.4.tar.gz) = 1f7cdbbdd45a85695931839b33bd6863
-SHA256 (telepathy-butterfly-0.1.4.tar.gz) = c4caeed6f11e430008a025ac32515338f7a04589456a99afe46022a94343461e
-SIZE (telepathy-butterfly-0.1.4.tar.gz) = 15582
+MD5 (telepathy-butterfly-0.3.1.tar.gz) = 30f95672c5317c050996f73e792b7c41
+SHA256 (telepathy-butterfly-0.3.1.tar.gz) = d8185e611983a77aaa8debccce00149af66694be4e08cea2040253ef3924603b
+SIZE (telepathy-butterfly-0.3.1.tar.gz) = 122795
diff --git a/net-im/telepathy-butterfly/pkg-plist b/net-im/telepathy-butterfly/pkg-plist
index 753f62cd71f4..37119a56c0d4 100644
--- a/net-im/telepathy-butterfly/pkg-plist
+++ b/net-im/telepathy-butterfly/pkg-plist
@@ -1,21 +1,50 @@
-bin/telepathy-butterfly
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/__init__.py
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/__init__.pyc
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/__init__.pyo
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/connection.py
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/connection.pyc
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/connection.pyo
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/connmgr.py
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/connmgr.pyc
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/connmgr.pyo
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/contacts.py
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/contacts.pyc
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/contacts.pyo
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/conversation.py
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/conversation.pyc
-%%PYTHON_SITELIBDIR%%/TelepathyButterfly/conversation.pyo
+%%PYTHON_SITELIBDIR%%/butterfly/__init__.py
+%%PYTHON_SITELIBDIR%%/butterfly/__init__.pyc
+%%PYTHON_SITELIBDIR%%/butterfly/__init__.pyo
+%%PYTHON_SITELIBDIR%%/butterfly/aliasing.py
+%%PYTHON_SITELIBDIR%%/butterfly/aliasing.pyc
+%%PYTHON_SITELIBDIR%%/butterfly/aliasing.pyo
+%%PYTHON_SITELIBDIR%%/butterfly/avatars.py
+%%PYTHON_SITELIBDIR%%/butterfly/avatars.pyc
+%%PYTHON_SITELIBDIR%%/butterfly/avatars.pyo
+%%PYTHON_SITELIBDIR%%/butterfly/channel/__init__.py
+%%PYTHON_SITELIBDIR%%/butterfly/channel/__init__.pyc
+%%PYTHON_SITELIBDIR%%/butterfly/channel/__init__.pyo
+%%PYTHON_SITELIBDIR%%/butterfly/channel/contact_list.py
+%%PYTHON_SITELIBDIR%%/butterfly/channel/contact_list.pyc
+%%PYTHON_SITELIBDIR%%/butterfly/channel/contact_list.pyo
+%%PYTHON_SITELIBDIR%%/butterfly/channel/group.py
+%%PYTHON_SITELIBDIR%%/butterfly/channel/group.pyc
+%%PYTHON_SITELIBDIR%%/butterfly/channel/group.pyo
+%%PYTHON_SITELIBDIR%%/butterfly/channel/text.py
+%%PYTHON_SITELIBDIR%%/butterfly/channel/text.pyc
+%%PYTHON_SITELIBDIR%%/butterfly/channel/text.pyo
+%%PYTHON_SITELIBDIR%%/butterfly/channel_manager.py
+%%PYTHON_SITELIBDIR%%/butterfly/channel_manager.pyc
+%%PYTHON_SITELIBDIR%%/butterfly/channel_manager.pyo
+%%PYTHON_SITELIBDIR%%/butterfly/connection.py
+%%PYTHON_SITELIBDIR%%/butterfly/connection.pyc
+%%PYTHON_SITELIBDIR%%/butterfly/connection.pyo
+%%PYTHON_SITELIBDIR%%/butterfly/connection_manager.py
+%%PYTHON_SITELIBDIR%%/butterfly/connection_manager.pyc
+%%PYTHON_SITELIBDIR%%/butterfly/connection_manager.pyo
+%%PYTHON_SITELIBDIR%%/butterfly/handle.py
+%%PYTHON_SITELIBDIR%%/butterfly/handle.pyc
+%%PYTHON_SITELIBDIR%%/butterfly/handle.pyo
+%%PYTHON_SITELIBDIR%%/butterfly/presence.py
+%%PYTHON_SITELIBDIR%%/butterfly/presence.pyc
+%%PYTHON_SITELIBDIR%%/butterfly/presence.pyo
+%%PYTHON_SITELIBDIR%%/butterfly/util/__init__.py
+%%PYTHON_SITELIBDIR%%/butterfly/util/__init__.pyc
+%%PYTHON_SITELIBDIR%%/butterfly/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/butterfly/util/decorator.py
+%%PYTHON_SITELIBDIR%%/butterfly/util/decorator.pyc
+%%PYTHON_SITELIBDIR%%/butterfly/util/decorator.pyo
+libexec/telepathy-butterfly
 share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.butterfly.service
 share/telepathy/managers/butterfly.manager
-@dirrm %%PYTHON_SITELIBDIR%%/TelepathyButterfly
+@dirrm %%PYTHON_SITELIBDIR%%/butterfly/util
+@dirrm %%PYTHON_SITELIBDIR%%/butterfly/channel
+@dirrm %%PYTHON_SITELIBDIR%%/butterfly
 @dirrmtry share/telepathy/managers
 @dirrmtry share/telepathy