Update to 5.2.5.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13001 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 43 insertions, 6 deletions

diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 232d41430..a1ba80976 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -3,10 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.4 2008/03/20 03:20:54 marcus Exp $
+#    $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.6 2009/08/28 20:57:42 marcus Exp $
 
 PORTNAME=	telepathy-mission-control
-PORTVERSION=	5.2.1
+PORTVERSION=	5.2.5
 CATEGORIES=	net-im devel
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-mission-control/
 
@@ -25,6 +25,8 @@ USE_LDCONFIG=	yes
 MAN1=		mc-account-convert.1 mc-tool.1 mc-wait-for-name.1
 MAN8=		mission-control-5.8
 
+PLIST_SUB=	VERSION=${PORTVERSION}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/gtk-doc/html|/${DOCSDIR}|' \
 		${WRKSRC}/configure
diff --git a/net-im/telepathy-mission-control/distinfo b/net-im/telepathy-mission-control/distinfo
index ac67e213d..02f073703 100644
--- a/net-im/telepathy-mission-control/distinfo
+++ b/net-im/telepathy-mission-control/distinfo
@@ -1,3 +1,3 @@
-MD5 (telepathy-mission-control-5.2.1.tar.gz) = a27780ecced46c87132fb96d6d604355
-SHA256 (telepathy-mission-control-5.2.1.tar.gz) = 1582c5a297d370daa658420500307c5e0a89dc843ebc1901f8a7144610281be7
-SIZE (telepathy-mission-control-5.2.1.tar.gz) = 1033538
+MD5 (telepathy-mission-control-5.2.5.tar.gz) = 011d1eebe8c580778fccc093be7b3692
+SHA256 (telepathy-mission-control-5.2.5.tar.gz) = 91b41e6759cbde71cd2b824b1eaaadbb4d1f039ff3b5faec7b6ec050f294c684
+SIZE (telepathy-mission-control-5.2.5.tar.gz) = 1045133
diff --git a/net-im/telepathy-mission-control/files/patch-util_mc-tool.c b/net-im/telepathy-mission-control/files/patch-util_mc-tool.c
new file mode 100644
index 000000000..c599bea27
--- /dev/null
+++ b/net-im/telepathy-mission-control/files/patch-util_mc-tool.c
@@ -0,0 +1,35 @@
+--- util/mc-tool.c.orig	2009-09-22 22:49:32.000000000 -0400
++++ util/mc-tool.c	2009-09-22 22:50:39.000000000 -0400
+@@ -1103,7 +1103,7 @@ main (int argc, char **argv)
+     McAccountManager *am = NULL;
+     McAccount *a = NULL;
+     DBusGConnection *dbus_conn;
+-    TpDBusDaemon *daemon;
++    TpDBusDaemon *td_daemon;
+ 
+     g_type_init ();
+ 
+@@ -1114,19 +1114,19 @@ main (int argc, char **argv)
+     command.common.ret = 1;
+ 
+     dbus_conn = tp_get_bus ();
+-    daemon = tp_dbus_daemon_new (dbus_conn);
++    td_daemon = tp_dbus_daemon_new (dbus_conn);
+     dbus_g_connection_unref (dbus_conn);
+ 
+     if (command.common.account == NULL) {
+-	am = mc_account_manager_new (daemon);
++	am = mc_account_manager_new (td_daemon);
+ 	mc_account_manager_call_when_ready (am, manager_ready, NULL);
+     }
+     else {
+ 	command.common.account = prefix (command.common.account);
+-	a = mc_account_new (daemon, command.common.account);
++	a = mc_account_new (td_daemon, command.common.account);
+ 	mc_account_call_when_ready (a, account_ready, NULL);
+     }
+-    g_object_unref (daemon);
++    g_object_unref (td_daemon);
+ 
+     main_loop = g_main_loop_new (NULL, FALSE);
+     g_main_loop_run (main_loop);
diff --git a/net-im/telepathy-mission-control/pkg-plist b/net-im/telepathy-mission-control/pkg-plist
index f01e48de5..00187ce89 100644
--- a/net-im/telepathy-mission-control/pkg-plist
+++ b/net-im/telepathy-mission-control/pkg-plist
@@ -23,7 +23,7 @@ include/libmcclient/mc-svc-client.h
 lib/libmcclient.a
 lib/libmcclient.la
 lib/libmcclient.so
-lib/libmcclient-5.2.1.so
+lib/libmcclient-%%VERSION%%.so
 libdata/pkgconfig/libmcclient.pc
 libexec/mission-control-5
 share/dbus-1/services/org.freedesktop.Telepathy.AccountManager.service