summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2010-11-20 15:37:08 +0000
committerKoop Mast <kwm@FreeBSD.org>2010-11-20 15:37:08 +0000
commit3680f27ebff58ece429c4e032f9ad84fb1372114 (patch)
tree6c5ff4664c1a779ddad350ac887e5706dbfdd4eb /net-im
parent- Upgrade 1.2000. (diff)
Presenting GNOME 2.32.1 for FreeBSD. The offical release notes for this
release can be found at http://library.gnome.org/misc/release-notes/2.32/ This will be the last release of the GNOME 2.x series, mainly a bugfix and bridge release to the first release of the GNOME 3.x series. This release features commits by avl, marcus, mezz and myself. The FreeBSD GNOME Team would like to thank the following contributors and testers for there help with this release: Zane C.B. <vvelox@vvelox.net> romain@ Olaf Seibert <O.Seibert@cs.ru.nl> DomiX Bapt <baptiste.daroussin@gmail.com> jsa@ miwi@ Sergio de Almeida Lenzi <lenzi.sergio@gmail.com> Maxim Samsonov <xors@mne.ru> Kris Moore And pav@ for 2 exp-runs PR: ports/152255 ports/143260 ports/141033 ports/149629 ports/150350 ports/151523 With hat: gnome@
Notes
Notes: svn path=/head/; revision=264837
Diffstat (limited to 'net-im')
-rw-r--r--net-im/Makefile2
-rw-r--r--net-im/empathy/Makefile21
-rw-r--r--net-im/empathy/distinfo5
-rw-r--r--net-im/empathy/files/patch-configure28
-rw-r--r--net-im/empathy/pkg-plist262
-rw-r--r--net-im/folks/Makefile32
-rw-r--r--net-im/folks/distinfo3
-rw-r--r--net-im/folks/pkg-descr7
-rw-r--r--net-im/folks/pkg-plist27
-rw-r--r--net-im/gossip/Makefile2
-rw-r--r--net-im/libpurple/Makefile2
-rw-r--r--net-im/pino/Makefile2
-rw-r--r--net-im/telepathy-gabble/Makefile9
-rw-r--r--net-im/telepathy-gabble/distinfo5
-rw-r--r--net-im/telepathy-gabble/files/patch-Makefile.in12
-rw-r--r--net-im/telepathy-gabble/files/patch-lib_gibber_asyncns.c10
-rw-r--r--net-im/telepathy-gabble/files/patch-lib_gibber_gibber-fd-transport.h12
-rw-r--r--net-im/telepathy-gabble/files/patch-lib_gibber_gibber-resolver.c12
-rw-r--r--net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c257
-rw-r--r--net-im/telepathy-gabble/files/patch-lib_gibber_gibber-util.h12
-rw-r--r--net-im/telepathy-gabble/files/patch-src_bytestream-socks5.c11
-rw-r--r--net-im/telepathy-gabble/files/patch-src_jingle-factory.c13
-rw-r--r--net-im/telepathy-gabble/files/patch-src_tube-stream.c10
-rw-r--r--net-im/telepathy-gabble/pkg-plist4
-rw-r--r--net-im/telepathy-glib/Makefile14
-rw-r--r--net-im/telepathy-glib/distinfo6
-rw-r--r--net-im/telepathy-glib/pkg-plist53
-rw-r--r--net-im/telepathy-logger/Makefile36
-rw-r--r--net-im/telepathy-logger/distinfo3
-rw-r--r--net-im/telepathy-logger/files/patch-configure13
-rw-r--r--net-im/telepathy-logger/pkg-descr3
-rw-r--r--net-im/telepathy-logger/pkg-plist35
-rw-r--r--net-im/telepathy-mission-control/Makefile7
-rw-r--r--net-im/telepathy-mission-control/distinfo6
-rw-r--r--net-im/telepathy-mission-control/files/patch-util_mc-tool.c35
-rw-r--r--net-im/telepathy-mission-control/pkg-plist108
36 files changed, 729 insertions, 350 deletions
diff --git a/net-im/Makefile b/net-im/Makefile
index 347dbe795d86..d52a63dc2339 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -29,6 +29,7 @@
SUBDIR += farsight2
SUBDIR += finch
SUBDIR += firetalk
+ SUBDIR += folks
SUBDIR += freetalk
SUBDIR += fugu
SUBDIR += gajim
@@ -162,6 +163,7 @@
SUBDIR += telepathy-glib
SUBDIR += telepathy-haze
SUBDIR += telepathy-idle
+ SUBDIR += telepathy-logger
SUBDIR += telepathy-mission-control
SUBDIR += telepathy-python
SUBDIR += telepathy-qt
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 3074ef428d66..5bd22029ed63 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/net-im/empathy/Makefile,v 1.5 2010/06/23 14:00:15 kwm Exp $
+# $MCom: ports/net-im/empathy/Makefile,v 1.76 2010/11/18 18:04:55 kwm Exp $
PORTNAME= empathy
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.2
CATEGORIES= net-im gnome
MASTER_SITES= GNOME
@@ -14,14 +14,18 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME IM client based around telepathy
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \
telepathy.2:${PORTSDIR}/net-im/libtelepathy \
telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
telepathy-farsight.0:${PORTSDIR}/net-im/telepathy-farsight \
+ telepathy-logger.1:${PORTSDIR}/net-im/telepathy-logger \
+ folks-telepathy.16:${PORTSDIR}/net-im/folks \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
canberra-gtk.0:${PORTSDIR}/audio/libcanberra
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
USE_GMAKE= yes
@@ -37,11 +41,12 @@ USE_PYTHON= yes
MAKE_JOBS_UNSAFE=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --enable-tpl=no
+CONFIGURE_ARGS= --disable-Werror \
+ --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
-GCONF_SCHEMAS= empathy.schemas
+GLIB_SCHEMAS= org.gnome.Empathy.gschema.xml
-MAN1= empathy.1
+MAN1= empathy.1 empathy-accounts.1
OPTIONS= JABBER "Enable jabber (XMPP) client support" on \
MSN "Enable MSN client support" on \
@@ -94,7 +99,7 @@ PLIST_SUB+= NST="@comment "
.endif
.if !defined(WITHOUT_MAP)
-LIB_DEPENDS+= champlain-0.4.1:${PORTSDIR}/graphics/libchamplain
+LIB_DEPENDS+= champlain-0.8.1:${PORTSDIR}/graphics/libchamplain
CONFIGURE_ARGS+=--enable-map
PLIST_SUB+= MAP=""
.else
@@ -102,8 +107,4 @@ CONFIGURE_ARGS+=--disable-map
PLIST_SUB+= MAP="@comment "
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR}|g ; \
- s|-Werror||g' ${WRKSRC}/configure
-
.include <bsd.port.post.mk>
diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo
index a03dd4772157..aef3ef0e3e1f 100644
--- a/net-im/empathy/distinfo
+++ b/net-im/empathy/distinfo
@@ -1,3 +1,2 @@
-MD5 (empathy-2.30.2.tar.bz2) = 964b48ccc63a2acdd14224eb763d6bf6
-SHA256 (empathy-2.30.2.tar.bz2) = e96846bafcedf39f9869d656031ba1c02c3568038e968db308ff07552e5024d7
-SIZE (empathy-2.30.2.tar.bz2) = 2644286
+SHA256 (empathy-2.32.2.tar.bz2) = f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861
+SIZE (empathy-2.32.2.tar.bz2) = 2936340
diff --git a/net-im/empathy/files/patch-configure b/net-im/empathy/files/patch-configure
new file mode 100644
index 000000000000..054f1a3e5c15
--- /dev/null
+++ b/net-im/empathy/files/patch-configure
@@ -0,0 +1,28 @@
+--- configure.orig 2010-11-18 17:41:43.000000000 +0100
++++ configure 2010-11-18 17:41:43.000000000 +0100
+@@ -13390,8 +13390,8 @@
+ .SECONDARY: $(gsettings_SCHEMAS)
+
+ gsettings__base_list = \
+- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid)
+ @$(NORMAL_INSTALL)
+@@ -15049,11 +15049,11 @@
+ fi
+
+ # Enable GSEAL checks if needed
+-if test $USE_MAINTAINER_MODE = yes; then
++#if test $USE_MAINTAINER_MODE = yes; then
+
+-$as_echo "#define GSEAL_ENABLE /**/" >>confdefs.h
++#$as_echo "#define GSEAL_ENABLE /**/" >>confdefs.h
+
+-fi
++#fi
+
+ # -----------------------------------------------------------
+ # Enable debug
diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist
index 9f1b99bb6f07..daa8228d30de 100644
--- a/net-im/empathy/pkg-plist
+++ b/net-im/empathy/pkg-plist
@@ -4,8 +4,13 @@ bin/empathy-debugger
%%NST%%lib/nautilus-sendto/plugins/libnstempathy.a
%%NST%%lib/nautilus-sendto/plugins/libnstempathy.la
%%NST%%lib/nautilus-sendto/plugins/libnstempathy.so
+libexec/empathy-auth-client
+libexec/empathy-av
+share/GConf/gsettings/empathy.convert
share/applications/empathy-accounts.desktop
share/applications/empathy.desktop
+share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service
+share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Auth.service
share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/Template.html
%%DATADIR%%/codec-preferences
@@ -33,8 +38,8 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/empathy-contact-widget.ui
%%DATADIR%%/empathy-ft-manager.ui
%%DATADIR%%/empathy-import-dialog.ui
+%%DATADIR%%/empathy-individual-widget.ui
%%DATADIR%%/empathy-irc-networks.dtd
-%%DATADIR%%/empathy-log-manager.xsl
%%DATADIR%%/empathy-log-window.ui
%%DATADIR%%/empathy-main-window.ui
%%MAP%%%%DATADIR%%/empathy-map-view.ui
@@ -66,13 +71,13 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/icons/hicolor/16x16/apps/im-sip.png
%%DATADIR%%/icons/hicolor/16x16/apps/im-yahoo.png
%%DATADIR%%/icons/hicolor/16x16/apps/im-zephyr.png
-%%DATADIR%%/icons/hicolor/16x16/status/empathy-available.png
-%%DATADIR%%/icons/hicolor/16x16/status/empathy-away.png
-%%DATADIR%%/icons/hicolor/16x16/status/empathy-busy.png
-%%DATADIR%%/icons/hicolor/16x16/status/empathy-extended-away.png
-%%DATADIR%%/icons/hicolor/16x16/status/empathy-offline.png
%%DATADIR%%/icons/hicolor/16x16/status/empathy-pending.png
%%DATADIR%%/icons/hicolor/16x16/status/im-message.png
+%%DATADIR%%/icons/hicolor/16x16/status/user-available.png
+%%DATADIR%%/icons/hicolor/16x16/status/user-away.png
+%%DATADIR%%/icons/hicolor/16x16/status/user-busy.png
+%%DATADIR%%/icons/hicolor/16x16/status/user-idle.png
+%%DATADIR%%/icons/hicolor/16x16/status/user-offline.png
%%DATADIR%%/icons/hicolor/16x16/status/user-typing.png
%%DATADIR%%/icons/hicolor/22x22/actions/im-message-new.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-aim.png
@@ -96,12 +101,13 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/icons/hicolor/22x22/apps/im-sip.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-yahoo.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-zephyr.png
-%%DATADIR%%/icons/hicolor/22x22/status/empathy-available.png
-%%DATADIR%%/icons/hicolor/22x22/status/empathy-away.png
-%%DATADIR%%/icons/hicolor/22x22/status/empathy-busy.png
-%%DATADIR%%/icons/hicolor/22x22/status/empathy-extended-away.png
-%%DATADIR%%/icons/hicolor/22x22/status/empathy-offline.png
%%DATADIR%%/icons/hicolor/22x22/status/empathy-pending.png
+%%DATADIR%%/icons/hicolor/22x22/status/im-message.png
+%%DATADIR%%/icons/hicolor/22x22/status/user-available.png
+%%DATADIR%%/icons/hicolor/22x22/status/user-away.png
+%%DATADIR%%/icons/hicolor/22x22/status/user-busy.png
+%%DATADIR%%/icons/hicolor/22x22/status/user-idle.png
+%%DATADIR%%/icons/hicolor/22x22/status/user-offline.png
%%DATADIR%%/icons/hicolor/24x24/actions/im-message-new.png
%%DATADIR%%/icons/hicolor/24x24/apps/im-aim.png
%%DATADIR%%/icons/hicolor/24x24/apps/im-ekiga.png
@@ -123,12 +129,12 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/icons/hicolor/24x24/apps/im-sip.png
%%DATADIR%%/icons/hicolor/24x24/apps/im-yahoo.png
%%DATADIR%%/icons/hicolor/24x24/apps/im-zephyr.png
-%%DATADIR%%/icons/hicolor/24x24/status/empathy-available.png
-%%DATADIR%%/icons/hicolor/24x24/status/empathy-away.png
-%%DATADIR%%/icons/hicolor/24x24/status/empathy-busy.png
-%%DATADIR%%/icons/hicolor/24x24/status/empathy-extended-away.png
-%%DATADIR%%/icons/hicolor/24x24/status/empathy-offline.png
%%DATADIR%%/icons/hicolor/24x24/status/empathy-pending.png
+%%DATADIR%%/icons/hicolor/24x24/status/user-available.png
+%%DATADIR%%/icons/hicolor/24x24/status/user-away.png
+%%DATADIR%%/icons/hicolor/24x24/status/user-busy.png
+%%DATADIR%%/icons/hicolor/24x24/status/user-idle.png
+%%DATADIR%%/icons/hicolor/24x24/status/user-offline.png
%%DATADIR%%/icons/hicolor/32x32/apps/im-aim.png
%%DATADIR%%/icons/hicolor/32x32/apps/im-ekiga.png
%%DATADIR%%/icons/hicolor/32x32/apps/im-gadugadu.png
@@ -149,12 +155,12 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/icons/hicolor/32x32/apps/im-sip.png
%%DATADIR%%/icons/hicolor/32x32/apps/im-yahoo.png
%%DATADIR%%/icons/hicolor/32x32/apps/im-zephyr.png
-%%DATADIR%%/icons/hicolor/32x32/status/empathy-available.png
-%%DATADIR%%/icons/hicolor/32x32/status/empathy-away.png
-%%DATADIR%%/icons/hicolor/32x32/status/empathy-busy.png
-%%DATADIR%%/icons/hicolor/32x32/status/empathy-extended-away.png
-%%DATADIR%%/icons/hicolor/32x32/status/empathy-offline.png
%%DATADIR%%/icons/hicolor/32x32/status/empathy-pending.png
+%%DATADIR%%/icons/hicolor/32x32/status/user-available.png
+%%DATADIR%%/icons/hicolor/32x32/status/user-away.png
+%%DATADIR%%/icons/hicolor/32x32/status/user-busy.png
+%%DATADIR%%/icons/hicolor/32x32/status/user-idle.png
+%%DATADIR%%/icons/hicolor/32x32/status/user-offline.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-aim.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-ekiga.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-facebook.png
@@ -176,12 +182,12 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/icons/hicolor/48x48/apps/im-sip.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-yahoo.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-zephyr.png
-%%DATADIR%%/icons/hicolor/48x48/status/empathy-available.png
-%%DATADIR%%/icons/hicolor/48x48/status/empathy-away.png
-%%DATADIR%%/icons/hicolor/48x48/status/empathy-busy.png
-%%DATADIR%%/icons/hicolor/48x48/status/empathy-extended-away.png
-%%DATADIR%%/icons/hicolor/48x48/status/empathy-offline.png
%%DATADIR%%/icons/hicolor/48x48/status/empathy-pending.png
+%%DATADIR%%/icons/hicolor/48x48/status/user-available.png
+%%DATADIR%%/icons/hicolor/48x48/status/user-away.png
+%%DATADIR%%/icons/hicolor/48x48/status/user-busy.png
+%%DATADIR%%/icons/hicolor/48x48/status/user-idle.png
+%%DATADIR%%/icons/hicolor/48x48/status/user-offline.png
%%DATADIR%%/icons/hicolor/icon-theme.cache
%%DATADIR%%/icons/hicolor/scalable/apps/im-aim.svg
%%DATADIR%%/icons/hicolor/scalable/apps/im-ekiga.svg
@@ -203,12 +209,12 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/icons/hicolor/scalable/apps/im-sip.svg
%%DATADIR%%/icons/hicolor/scalable/apps/im-yahoo.svg
%%DATADIR%%/icons/hicolor/scalable/apps/im-zephyr.svg
-%%DATADIR%%/icons/hicolor/scalable/status/empathy-available.svg
-%%DATADIR%%/icons/hicolor/scalable/status/empathy-away.svg
-%%DATADIR%%/icons/hicolor/scalable/status/empathy-busy.svg
-%%DATADIR%%/icons/hicolor/scalable/status/empathy-extended-away.svg
-%%DATADIR%%/icons/hicolor/scalable/status/empathy-offline.svg
%%DATADIR%%/icons/hicolor/scalable/status/empathy-pending.svg
+%%DATADIR%%/icons/hicolor/scalable/status/user-available.svg
+%%DATADIR%%/icons/hicolor/scalable/status/user-away.svg
+%%DATADIR%%/icons/hicolor/scalable/status/user-busy.svg
+%%DATADIR%%/icons/hicolor/scalable/status/user-idle.svg
+%%DATADIR%%/icons/hicolor/scalable/status/user-offline.svg
%%DATADIR%%/irc-networks.xml
share/gnome/help/empathy/C/account-irc.page
share/gnome/help/empathy/C/account-jabber.page
@@ -251,6 +257,7 @@ share/gnome/help/empathy/C/irc-nick-password.page
share/gnome/help/empathy/C/irc-send-file.page
share/gnome/help/empathy/C/irc-start-conversation.page
share/gnome/help/empathy/C/license.page
+share/gnome/help/empathy/C/link-contacts.page
share/gnome/help/empathy/C/prev-conv.page
share/gnome/help/empathy/C/prob-conn-acctdisabled.page
share/gnome/help/empathy/C/prob-conn-auth.page
@@ -306,6 +313,7 @@ share/gnome/help/empathy/ca/irc-nick-password.page
share/gnome/help/empathy/ca/irc-send-file.page
share/gnome/help/empathy/ca/irc-start-conversation.page
share/gnome/help/empathy/ca/license.page
+share/gnome/help/empathy/ca/link-contacts.page
share/gnome/help/empathy/ca/prev-conv.page
share/gnome/help/empathy/ca/prob-conn-acctdisabled.page
share/gnome/help/empathy/ca/prob-conn-auth.page
@@ -361,6 +369,7 @@ share/gnome/help/empathy/cs/irc-nick-password.page
share/gnome/help/empathy/cs/irc-send-file.page
share/gnome/help/empathy/cs/irc-start-conversation.page
share/gnome/help/empathy/cs/license.page
+share/gnome/help/empathy/cs/link-contacts.page
share/gnome/help/empathy/cs/prev-conv.page
share/gnome/help/empathy/cs/prob-conn-acctdisabled.page
share/gnome/help/empathy/cs/prob-conn-auth.page
@@ -416,6 +425,7 @@ share/gnome/help/empathy/de/irc-nick-password.page
share/gnome/help/empathy/de/irc-send-file.page
share/gnome/help/empathy/de/irc-start-conversation.page
share/gnome/help/empathy/de/license.page
+share/gnome/help/empathy/de/link-contacts.page
share/gnome/help/empathy/de/prev-conv.page
share/gnome/help/empathy/de/prob-conn-acctdisabled.page
share/gnome/help/empathy/de/prob-conn-auth.page
@@ -471,6 +481,7 @@ share/gnome/help/empathy/el/irc-nick-password.page
share/gnome/help/empathy/el/irc-send-file.page
share/gnome/help/empathy/el/irc-start-conversation.page
share/gnome/help/empathy/el/license.page
+share/gnome/help/empathy/el/link-contacts.page
share/gnome/help/empathy/el/prev-conv.page
share/gnome/help/empathy/el/prob-conn-acctdisabled.page
share/gnome/help/empathy/el/prob-conn-auth.page
@@ -526,6 +537,7 @@ share/gnome/help/empathy/en_GB/irc-nick-password.page
share/gnome/help/empathy/en_GB/irc-send-file.page
share/gnome/help/empathy/en_GB/irc-start-conversation.page
share/gnome/help/empathy/en_GB/license.page
+share/gnome/help/empathy/en_GB/link-contacts.page
share/gnome/help/empathy/en_GB/prev-conv.page
share/gnome/help/empathy/en_GB/prob-conn-acctdisabled.page
share/gnome/help/empathy/en_GB/prob-conn-auth.page
@@ -581,6 +593,7 @@ share/gnome/help/empathy/es/irc-nick-password.page
share/gnome/help/empathy/es/irc-send-file.page
share/gnome/help/empathy/es/irc-start-conversation.page
share/gnome/help/empathy/es/license.page
+share/gnome/help/empathy/es/link-contacts.page
share/gnome/help/empathy/es/prev-conv.page
share/gnome/help/empathy/es/prob-conn-acctdisabled.page
share/gnome/help/empathy/es/prob-conn-auth.page
@@ -636,6 +649,7 @@ share/gnome/help/empathy/fi/irc-nick-password.page
share/gnome/help/empathy/fi/irc-send-file.page
share/gnome/help/empathy/fi/irc-start-conversation.page
share/gnome/help/empathy/fi/license.page
+share/gnome/help/empathy/fi/link-contacts.page
share/gnome/help/empathy/fi/prev-conv.page
share/gnome/help/empathy/fi/prob-conn-acctdisabled.page
share/gnome/help/empathy/fi/prob-conn-auth.page
@@ -691,6 +705,7 @@ share/gnome/help/empathy/fr/irc-nick-password.page
share/gnome/help/empathy/fr/irc-send-file.page
share/gnome/help/empathy/fr/irc-start-conversation.page
share/gnome/help/empathy/fr/license.page
+share/gnome/help/empathy/fr/link-contacts.page
share/gnome/help/empathy/fr/prev-conv.page
share/gnome/help/empathy/fr/prob-conn-acctdisabled.page
share/gnome/help/empathy/fr/prob-conn-auth.page
@@ -705,6 +720,118 @@ share/gnome/help/empathy/fr/set-custom-status.page
share/gnome/help/empathy/fr/share-desktop.page
share/gnome/help/empathy/fr/status-icons.page
share/gnome/help/empathy/fr/video-call.page
+share/gnome/help/empathy/gl/account-irc.page
+share/gnome/help/empathy/gl/account-jabber.page
+share/gnome/help/empathy/gl/accounts-window.page
+share/gnome/help/empathy/gl/add-account.page
+share/gnome/help/empathy/gl/add-contact.page
+share/gnome/help/empathy/gl/audio-call.page
+share/gnome/help/empathy/gl/audio-video.page
+share/gnome/help/empathy/gl/change-status.page
+share/gnome/help/empathy/gl/create-account.page
+share/gnome/help/empathy/gl/disable-account.page
+share/gnome/help/empathy/gl/favorite-rooms.page
+share/gnome/help/empathy/gl/figures/audio-input-microphone.png
+share/gnome/help/empathy/gl/figures/available.png
+share/gnome/help/empathy/gl/figures/away.png
+share/gnome/help/empathy/gl/figures/busy.png
+share/gnome/help/empathy/gl/figures/camera-web.png
+share/gnome/help/empathy/gl/figures/empathy-logo.png
+share/gnome/help/empathy/gl/figures/empathy-main-window.png
+share/gnome/help/empathy/gl/figures/gtk-add.png
+share/gnome/help/empathy/gl/figures/gtk-edit.png
+share/gnome/help/empathy/gl/figures/gtk-remove.png
+share/gnome/help/empathy/gl/figures/offline.png
+share/gnome/help/empathy/gl/geolocation-not-showing.page
+share/gnome/help/empathy/gl/geolocation-privacy.page
+share/gnome/help/empathy/gl/geolocation-supported.page
+share/gnome/help/empathy/gl/geolocation-turn.page
+share/gnome/help/empathy/gl/geolocation-what-is.page
+share/gnome/help/empathy/gl/geolocation.page
+share/gnome/help/empathy/gl/group-conversations.page
+share/gnome/help/empathy/gl/hide-contacts.page
+share/gnome/help/empathy/gl/import-account.page
+share/gnome/help/empathy/gl/index.page
+share/gnome/help/empathy/gl/introduction.page
+share/gnome/help/empathy/gl/irc-commands.page
+share/gnome/help/empathy/gl/irc-join-pwd.page
+share/gnome/help/empathy/gl/irc-join-room.page
+share/gnome/help/empathy/gl/irc-manage.page
+share/gnome/help/empathy/gl/irc-nick-password.page
+share/gnome/help/empathy/gl/irc-send-file.page
+share/gnome/help/empathy/gl/irc-start-conversation.page
+share/gnome/help/empathy/gl/license.page
+share/gnome/help/empathy/gl/link-contacts.page
+share/gnome/help/empathy/gl/prev-conv.page
+share/gnome/help/empathy/gl/prob-conn-acctdisabled.page
+share/gnome/help/empathy/gl/prob-conn-auth.page
+share/gnome/help/empathy/gl/prob-conn-name.page
+share/gnome/help/empathy/gl/prob-conn-neterror.page
+share/gnome/help/empathy/gl/prob-conn.page
+share/gnome/help/empathy/gl/remove-account.page
+share/gnome/help/empathy/gl/salut-protocol.page
+share/gnome/help/empathy/gl/send-file.page
+share/gnome/help/empathy/gl/send-message.page
+share/gnome/help/empathy/gl/set-custom-status.page
+share/gnome/help/empathy/gl/share-desktop.page
+share/gnome/help/empathy/gl/status-icons.page
+share/gnome/help/empathy/gl/video-call.page
+share/gnome/help/empathy/hu/account-irc.page
+share/gnome/help/empathy/hu/account-jabber.page
+share/gnome/help/empathy/hu/accounts-window.page
+share/gnome/help/empathy/hu/add-account.page
+share/gnome/help/empathy/hu/add-contact.page
+share/gnome/help/empathy/hu/audio-call.page
+share/gnome/help/empathy/hu/audio-video.page
+share/gnome/help/empathy/hu/change-status.page
+share/gnome/help/empathy/hu/create-account.page
+share/gnome/help/empathy/hu/disable-account.page
+share/gnome/help/empathy/hu/favorite-rooms.page
+share/gnome/help/empathy/hu/figures/audio-input-microphone.png
+share/gnome/help/empathy/hu/figures/available.png
+share/gnome/help/empathy/hu/figures/away.png
+share/gnome/help/empathy/hu/figures/busy.png
+share/gnome/help/empathy/hu/figures/camera-web.png
+share/gnome/help/empathy/hu/figures/empathy-logo.png
+share/gnome/help/empathy/hu/figures/empathy-main-window.png
+share/gnome/help/empathy/hu/figures/gtk-add.png
+share/gnome/help/empathy/hu/figures/gtk-edit.png
+share/gnome/help/empathy/hu/figures/gtk-remove.png
+share/gnome/help/empathy/hu/figures/offline.png
+share/gnome/help/empathy/hu/geolocation-not-showing.page
+share/gnome/help/empathy/hu/geolocation-privacy.page
+share/gnome/help/empathy/hu/geolocation-supported.page
+share/gnome/help/empathy/hu/geolocation-turn.page
+share/gnome/help/empathy/hu/geolocation-what-is.page
+share/gnome/help/empathy/hu/geolocation.page
+share/gnome/help/empathy/hu/group-conversations.page
+share/gnome/help/empathy/hu/hide-contacts.page
+share/gnome/help/empathy/hu/import-account.page
+share/gnome/help/empathy/hu/index.page
+share/gnome/help/empathy/hu/introduction.page
+share/gnome/help/empathy/hu/irc-commands.page
+share/gnome/help/empathy/hu/irc-join-pwd.page
+share/gnome/help/empathy/hu/irc-join-room.page
+share/gnome/help/empathy/hu/irc-manage.page
+share/gnome/help/empathy/hu/irc-nick-password.page
+share/gnome/help/empathy/hu/irc-send-file.page
+share/gnome/help/empathy/hu/irc-start-conversation.page
+share/gnome/help/empathy/hu/license.page
+share/gnome/help/empathy/hu/link-contacts.page
+share/gnome/help/empathy/hu/prev-conv.page
+share/gnome/help/empathy/hu/prob-conn-acctdisabled.page
+share/gnome/help/empathy/hu/prob-conn-auth.page
+share/gnome/help/empathy/hu/prob-conn-name.page
+share/gnome/help/empathy/hu/prob-conn-neterror.page
+share/gnome/help/empathy/hu/prob-conn.page
+share/gnome/help/empathy/hu/remove-account.page
+share/gnome/help/empathy/hu/salut-protocol.page
+share/gnome/help/empathy/hu/send-file.page
+share/gnome/help/empathy/hu/send-message.page
+share/gnome/help/empathy/hu/set-custom-status.page
+share/gnome/help/empathy/hu/share-desktop.page
+share/gnome/help/empathy/hu/status-icons.page
+share/gnome/help/empathy/hu/video-call.page
share/gnome/help/empathy/it/account-irc.page
share/gnome/help/empathy/it/account-jabber.page
share/gnome/help/empathy/it/accounts-window.page
@@ -746,6 +873,7 @@ share/gnome/help/empathy/it/irc-nick-password.page
share/gnome/help/empathy/it/irc-send-file.page
share/gnome/help/empathy/it/irc-start-conversation.page
share/gnome/help/empathy/it/license.page
+share/gnome/help/empathy/it/link-contacts.page
share/gnome/help/empathy/it/prev-conv.page
share/gnome/help/empathy/it/prob-conn-acctdisabled.page
share/gnome/help/empathy/it/prob-conn-auth.page
@@ -801,6 +929,7 @@ share/gnome/help/empathy/ru/irc-nick-password.page
share/gnome/help/empathy/ru/irc-send-file.page
share/gnome/help/empathy/ru/irc-start-conversation.page
share/gnome/help/empathy/ru/license.page
+share/gnome/help/empathy/ru/link-contacts.page
share/gnome/help/empathy/ru/prev-conv.page
share/gnome/help/empathy/ru/prob-conn-acctdisabled.page
share/gnome/help/empathy/ru/prob-conn-auth.page
@@ -856,6 +985,7 @@ share/gnome/help/empathy/sv/irc-nick-password.page
share/gnome/help/empathy/sv/irc-send-file.page
share/gnome/help/empathy/sv/irc-start-conversation.page
share/gnome/help/empathy/sv/license.page
+share/gnome/help/empathy/sv/link-contacts.page
share/gnome/help/empathy/sv/prev-conv.page
share/gnome/help/empathy/sv/prob-conn-acctdisabled.page
share/gnome/help/empathy/sv/prob-conn-auth.page
@@ -870,12 +1000,69 @@ share/gnome/help/empathy/sv/set-custom-status.page
share/gnome/help/empathy/sv/share-desktop.page
share/gnome/help/empathy/sv/status-icons.page
share/gnome/help/empathy/sv/video-call.page
+share/gnome/help/empathy/zh_CN/account-irc.page
+share/gnome/help/empathy/zh_CN/account-jabber.page
+share/gnome/help/empathy/zh_CN/accounts-window.page
+share/gnome/help/empathy/zh_CN/add-account.page
+share/gnome/help/empathy/zh_CN/add-contact.page
+share/gnome/help/empathy/zh_CN/audio-call.page
+share/gnome/help/empathy/zh_CN/audio-video.page
+share/gnome/help/empathy/zh_CN/change-status.page
+share/gnome/help/empathy/zh_CN/create-account.page
+share/gnome/help/empathy/zh_CN/disable-account.page
+share/gnome/help/empathy/zh_CN/favorite-rooms.page
+share/gnome/help/empathy/zh_CN/figures/audio-input-microphone.png
+share/gnome/help/empathy/zh_CN/figures/available.png
+share/gnome/help/empathy/zh_CN/figures/away.png
+share/gnome/help/empathy/zh_CN/figures/busy.png
+share/gnome/help/empathy/zh_CN/figures/camera-web.png
+share/gnome/help/empathy/zh_CN/figures/empathy-logo.png
+share/gnome/help/empathy/zh_CN/figures/empathy-main-window.png
+share/gnome/help/empathy/zh_CN/figures/gtk-add.png
+share/gnome/help/empathy/zh_CN/figures/gtk-edit.png
+share/gnome/help/empathy/zh_CN/figures/gtk-remove.png
+share/gnome/help/empathy/zh_CN/figures/offline.png
+share/gnome/help/empathy/zh_CN/geolocation-not-showing.page
+share/gnome/help/empathy/zh_CN/geolocation-privacy.page
+share/gnome/help/empathy/zh_CN/geolocation-supported.page
+share/gnome/help/empathy/zh_CN/geolocation-turn.page
+share/gnome/help/empathy/zh_CN/geolocation-what-is.page
+share/gnome/help/empathy/zh_CN/geolocation.page
+share/gnome/help/empathy/zh_CN/group-conversations.page
+share/gnome/help/empathy/zh_CN/hide-contacts.page
+share/gnome/help/empathy/zh_CN/import-account.page
+share/gnome/help/empathy/zh_CN/index.page
+share/gnome/help/empathy/zh_CN/introduction.page
+share/gnome/help/empathy/zh_CN/irc-commands.page
+share/gnome/help/empathy/zh_CN/irc-join-pwd.page
+share/gnome/help/empathy/zh_CN/irc-join-room.page
+share/gnome/help/empathy/zh_CN/irc-manage.page
+share/gnome/help/empathy/zh_CN/irc-nick-password.page
+share/gnome/help/empathy/zh_CN/irc-send-file.page
+share/gnome/help/empathy/zh_CN/irc-start-conversation.page
+share/gnome/help/empathy/zh_CN/license.page
+share/gnome/help/empathy/zh_CN/link-contacts.page
+share/gnome/help/empathy/zh_CN/prev-conv.page
+share/gnome/help/empathy/zh_CN/prob-conn-acctdisabled.page
+share/gnome/help/empathy/zh_CN/prob-conn-auth.page
+share/gnome/help/empathy/zh_CN/prob-conn-name.page
+share/gnome/help/empathy/zh_CN/prob-conn-neterror.page
+share/gnome/help/empathy/zh_CN/prob-conn.page
+share/gnome/help/empathy/zh_CN/remove-account.page
+share/gnome/help/empathy/zh_CN/salut-protocol.page
+share/gnome/help/empathy/zh_CN/send-file.page
+share/gnome/help/empathy/zh_CN/send-message.page
+share/gnome/help/empathy/zh_CN/set-custom-status.page
+share/gnome/help/empathy/zh_CN/share-desktop.page
+share/gnome/help/empathy/zh_CN/status-icons.page
+share/gnome/help/empathy/zh_CN/video-call.page
share/icons/hicolor/16x16/apps/empathy.png
share/icons/hicolor/22x22/apps/empathy.png
share/icons/hicolor/24x24/apps/empathy.png
share/icons/hicolor/32x32/apps/empathy.png
share/icons/hicolor/48x48/apps/empathy.png
share/icons/hicolor/scalable/apps/empathy.svg
+share/locale/an/LC_MESSAGES/empathy.mo
share/locale/ar/LC_MESSAGES/empathy.mo
share/locale/as/LC_MESSAGES/empathy.mo
share/locale/ast/LC_MESSAGES/empathy.mo
@@ -911,8 +1098,10 @@ share/locale/he/LC_MESSAGES/empathy.mo
share/locale/hi/LC_MESSAGES/empathy.mo
share/locale/hr/LC_MESSAGES/empathy.mo
share/locale/hu/LC_MESSAGES/empathy.mo
+share/locale/id/LC_MESSAGES/empathy.mo
share/locale/it/LC_MESSAGES/empathy.mo
share/locale/ja/LC_MESSAGES/empathy.mo
+share/locale/kk/LC_MESSAGES/empathy.mo
share/locale/kn/LC_MESSAGES/empathy.mo
share/locale/ko/LC_MESSAGES/empathy.mo
share/locale/ku/LC_MESSAGES/empathy.mo
@@ -926,6 +1115,7 @@ share/locale/ms/LC_MESSAGES/empathy.mo
share/locale/nb/LC_MESSAGES/empathy.mo
share/locale/ne/LC_MESSAGES/empathy.mo
share/locale/nl/LC_MESSAGES/empathy.mo
+share/locale/nn/LC_MESSAGES/empathy.mo
share/locale/oc/LC_MESSAGES/empathy.mo
share/locale/or/LC_MESSAGES/empathy.mo
share/locale/pa/LC_MESSAGES/empathy.mo
@@ -950,15 +1140,23 @@ share/locale/vi/LC_MESSAGES/empathy.mo
share/locale/zh_CN/LC_MESSAGES/empathy.mo
share/locale/zh_HK/LC_MESSAGES/empathy.mo
share/locale/zh_TW/LC_MESSAGES/empathy.mo
+share/telepathy/clients/Empathy.AudioVideo.client
+share/telepathy/clients/Empathy.Auth.client
share/telepathy/clients/Empathy.client
@dirrmtry share/telepathy/clients
@dirrmtry share/telepathy
+@dirrm share/gnome/help/empathy/zh_CN/figures
+@dirrm share/gnome/help/empathy/zh_CN
@dirrm share/gnome/help/empathy/sv/figures
@dirrm share/gnome/help/empathy/sv
@dirrm share/gnome/help/empathy/ru/figures
@dirrm share/gnome/help/empathy/ru
@dirrm share/gnome/help/empathy/it/figures
@dirrm share/gnome/help/empathy/it
+@dirrm share/gnome/help/empathy/hu/figures
+@dirrm share/gnome/help/empathy/hu
+@dirrm share/gnome/help/empathy/gl/figures
+@dirrm share/gnome/help/empathy/gl
@dirrm share/gnome/help/empathy/fr/figures
@dirrm share/gnome/help/empathy/fr
@dirrm share/gnome/help/empathy/fi/figures
@@ -1037,3 +1235,5 @@ share/telepathy/clients/Empathy.client
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
new file mode 100644
index 000000000000..dc4484a65f19
--- /dev/null
+++ b/net-im/folks/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for: folks
+# Date created: 23 July 2010
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/net-im/folks/Makefile,v 1.8 2010/10/26 08:47:55 kwm Exp $
+#
+
+PORTNAME= folks
+PORTVERSION= 0.2.1
+CATEGORIES= net-im
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= library to aggregates people from multiple sources
+
+BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen \
+ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS= gee.2:${PORTSDIR}/devel/libgee \
+ telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
+
+USE_BZIP2= yes
+USE_LDCONFIG= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+PLIST_SUB= VERSION=16
+
+.include <bsd.port.mk>
diff --git a/net-im/folks/distinfo b/net-im/folks/distinfo
new file mode 100644
index 000000000000..240bbf5187cb
--- /dev/null
+++ b/net-im/folks/distinfo
@@ -0,0 +1,3 @@
+MD5 (folks-0.2.1.tar.bz2) = afabe04bd84347e73e9c94eb1b8cf3c1
+SHA256 (folks-0.2.1.tar.bz2) = f8eeeb6a6974416d4db1ab6b18187173fb6ff4ec7830bece379dfba9b25f2a29
+SIZE (folks-0.2.1.tar.bz2) = 465522
diff --git a/net-im/folks/pkg-descr b/net-im/folks/pkg-descr
new file mode 100644
index 000000000000..21280dabf8d6
--- /dev/null
+++ b/net-im/folks/pkg-descr
@@ -0,0 +1,7 @@
+libfolks is a library that aggregates people from multiple sources
+(eg, Telepathy connection managers and eventually evolution data server,
+Facebook, etc.) to create metacontacts. It's written in Vala (in part to
+evaluate Vala). The initial goal is for GObject/C support, though the Vala
+bindings should basically automatic.
+
+WWW: http://telepathy.freedesktop.org/wiki/Folks
diff --git a/net-im/folks/pkg-plist b/net-im/folks/pkg-plist
new file mode 100644
index 000000000000..a9cd7dbadde4
--- /dev/null
+++ b/net-im/folks/pkg-plist
@@ -0,0 +1,27 @@
+bin/folks-import
+include/folks/folks-telepathy.h
+include/folks/folks.h
+lib/folks/%%VERSION%%/backends/key-file/libfolks-backend-key-file.la
+lib/folks/%%VERSION%%/backends/key-file/libfolks-backend-key-file.so
+lib/folks/%%VERSION%%/backends/telepathy/libfolks-backend-telepathy.la
+lib/folks/%%VERSION%%/backends/telepathy/libfolks-backend-telepathy.so
+lib/libfolks-telepathy.la
+lib/libfolks-telepathy.so
+lib/libfolks-telepathy.so.%%VERSION%%
+lib/libfolks.la
+lib/libfolks.so
+lib/libfolks.so.%%VERSION%%
+libdata/pkgconfig/folks-telepathy.pc
+libdata/pkgconfig/folks.pc
+share/vala/vapi/folks-telepathy.deps
+share/vala/vapi/folks-telepathy.vapi
+share/vala/vapi/folks.deps
+share/vala/vapi/folks.vapi
+@dirrmtry share/vala/vapi
+@dirrmtry share/vala
+@dirrm lib/folks/%%VERSION%%/backends/telepathy
+@dirrm lib/folks/%%VERSION%%/backends/key-file
+@dirrm lib/folks/%%VERSION%%/backends
+@dirrm lib/folks/%%VERSION%%
+@dirrm lib/folks
+@dirrm include/folks
diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile
index f34f4d4f6b1e..2b33b745fccc 100644
--- a/net-im/gossip/Makefile
+++ b/net-im/gossip/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gossip
PORTVERSION= 0.31
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-im gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index be55038b6f9a..0461449ba111 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -8,7 +8,7 @@
PORTNAME?= libpurple
PORTVERSION= 2.7.5
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= net-im
MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION}
DISTNAME= pidgin-${PORTVERSION}
diff --git a/net-im/pino/Makefile b/net-im/pino/Makefile
index e0b086122f72..33169ad2dab6 100644
--- a/net-im/pino/Makefile
+++ b/net-im/pino/Makefile
@@ -22,6 +22,8 @@ LIB_DEPENDS= gee.2:${PORTSDIR}/devel/libgee \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+BROKEN= Doesn't build with vala-0.10
+
PROJECTHOST= pino-twitter
USE_GNOME= gnomehack intltool libxml2 gtk20 glib20
USE_GETTEXT= yes
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index ee1a464b64b8..a102210d672e 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -3,10 +3,10 @@
# Whom: Florent Thoumie <flz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net-im/telepathy-gabble/Makefile,v 1.5 2009/01/08 07:03:21 marcus Exp $
+# $MCom: ports/net-im/telepathy-gabble/Makefile,v 1.10 2010/11/14 16:18:09 marcus Exp $
PORTNAME= telepathy-gabble
-PORTVERSION= 0.8.14
+PORTVERSION= 0.10.4
CATEGORIES= net-im
MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
@@ -15,13 +15,16 @@ COMMENT= Jabber Connection Manager for Telepathy Framework
LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \
dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \
+ nice.pc:${PORTSDIR}/net-im/libnice \
+ uuid.pc:${PORTSDIR}/misc/e2fsprogs-libuuid \
telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib \
loudmouth-1.0.pc:${PORTSDIR}/net-im/loudmouth
BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \
+ sqlite3.8:${PORTSDIR}/databases/sqlite3
RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
GNU_CONFIGURE= yes
diff --git a/net-im/telepathy-gabble/distinfo b/net-im/telepathy-gabble/distinfo
index 17a1d3b07f23..7f77130ac4aa 100644
--- a/net-im/telepathy-gabble/distinfo
+++ b/net-im/telepathy-gabble/distinfo
@@ -1,3 +1,2 @@
-MD5 (telepathy-gabble-0.8.14.tar.gz) = 0114937c1664c6b76b8cd983f24c2089
-SHA256 (telepathy-gabble-0.8.14.tar.gz) = 71a1bb38478c8e5b831531036980ba46d157fc072226e11c8624e8c395a682d1
-SIZE (telepathy-gabble-0.8.14.tar.gz) = 1519190
+SHA256 (telepathy-gabble-0.10.4.tar.gz) = abdf07e833b934fa7cd0c9e34894a11da037adf03a4fdde4dc7818ed990a662c
+SIZE (telepathy-gabble-0.10.4.tar.gz) = 2936168
diff --git a/net-im/telepathy-gabble/files/patch-Makefile.in b/net-im/telepathy-gabble/files/patch-Makefile.in
index 911ee27c5cf6..6e8234229f1c 100644
--- a/net-im/telepathy-gabble/files/patch-Makefile.in
+++ b/net-im/telepathy-gabble/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig 2009-03-12 20:41:53.000000000 -0400
-+++ Makefile.in 2009-03-12 20:41:59.000000000 -0400
-@@ -203,7 +203,7 @@ top_build_prefix = @top_build_prefix@
+--- Makefile.in.orig 2010-09-18 17:29:38.000000000 +0000
++++ Makefile.in 2010-09-18 17:29:53.000000000 +0000
+@@ -267,7 +267,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = docs tools extensions lib src data m4 tests
-+SUBDIRS = docs tools extensions lib src data m4
- DISTCHECK_CONFIGURE_FLAGS = --disable-debug
+-SUBDIRS = docs tools extensions lib src data m4 plugins tests gabble
++SUBDIRS = docs tools extensions lib src data m4 plugins gabble
+ DISTCHECK_CONFIGURE_FLAGS = --disable-debug --enable-gtk-doc
CLEANFILES = FIXME.out
LCOV_CHECK_ARGS = CHECK_TWISTED_SLEEP=6
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_asyncns.c b/net-im/telepathy-gabble/files/patch-lib_gibber_asyncns.c
deleted file mode 100644
index ff3bb3733f37..000000000000
--- a/net-im/telepathy-gabble/files/patch-lib_gibber_asyncns.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/gibber/asyncns.c.orig 2009-03-08 13:01:42.000000000 -0400
-+++ lib/gibber/asyncns.c 2009-03-08 13:02:06.000000000 -0400
-@@ -35,6 +35,7 @@
- #include <errno.h>
- #include <sys/wait.h>
- #include <sys/types.h>
-+#include <sys/resource.h>
- #include <pwd.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-fd-transport.h b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-fd-transport.h
deleted file mode 100644
index 8cf86b314b6d..000000000000
--- a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-fd-transport.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/gibber/gibber-fd-transport.h.orig 2009-01-08 01:53:58.000000000 -0500
-+++ lib/gibber/gibber-fd-transport.h 2009-01-08 01:54:11.000000000 -0500
-@@ -23,7 +23,9 @@
-
- #include <glib-object.h>
-
-+#include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <netdb.h>
-
- #include "gibber-transport.h"
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-resolver.c b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-resolver.c
deleted file mode 100644
index 6d20d57dc734..000000000000
--- a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-resolver.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/gibber/gibber-resolver.c.orig 2009-03-15 02:48:07.000000000 -0400
-+++ lib/gibber/gibber-resolver.c 2009-03-15 02:48:53.000000000 -0400
-@@ -735,7 +735,9 @@ gibber_resolver_gai_error_to_g_error (in
- break;
-
- case EAI_MEMORY:
-+#ifdef EAI_OVERFLOW
- case EAI_OVERFLOW:
-+#endif
- code = GIBBER_RESOLVER_ERROR_MEMORY;
- break;
-
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c
index 79aaa44ec998..c055de832675 100644
--- a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c
+++ b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c
@@ -1,116 +1,181 @@
---- lib/gibber/gibber-unix-transport.c.orig 2009-06-02 23:56:27.000000000 -0400
-+++ lib/gibber/gibber-unix-transport.c 2009-06-03 00:13:18.000000000 -0400
-@@ -200,11 +200,12 @@ gibber_unix_transport_send_credentials (
- gsize size)
- {
- int fd, ret;
-- struct ucred *cred;
- struct msghdr msg;
-- struct cmsghdr *ch;
- struct iovec iov;
-- char buffer[CMSG_SPACE (sizeof (struct ucred))];
+--- lib/gibber/gibber-unix-transport.c.orig 2010-06-09 16:09:58.000000000 +0000
++++ lib/gibber/gibber-unix-transport.c 2010-09-18 21:24:44.000000000 +0000
+@@ -375,6 +375,167 @@ gibber_unix_transport_recv_credentials (
+ return TRUE;
+ }
+
++/* End Linux part */
++#elif defined(__FreeBSD__)
++
++gboolean
++gibber_unix_transport_send_credentials (GibberUnixTransport *transport,
++ const guint8 *data,
++ gsize size)
++{
++ int fd, ret;
++ struct msghdr msg;
++ struct iovec iov;
+ union {
-+ struct cmsghdr hdr;
-+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
++ struct cmsghdr hdr;
++ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+ } cmsg;
-
- DEBUG ("send credentials");
- fd = GIBBER_FD_TRANSPORT (transport)->fd;
-@@ -217,19 +218,12 @@ gibber_unix_transport_send_credentials (
- memset (&msg, 0, sizeof msg);
- msg.msg_iov = &iov;
- msg.msg_iovlen = 1;
-- msg.msg_control = buffer;
-- msg.msg_controllen = sizeof (buffer);
--
-- /* Set the credentials */
-- ch = CMSG_FIRSTHDR (&msg);
-- ch->cmsg_len = CMSG_LEN (sizeof (struct ucred));
-- ch->cmsg_level = SOL_SOCKET;
-- ch->cmsg_type = SCM_CREDENTIALS;
--
-- cred = (struct ucred *) CMSG_DATA (ch);
-- cred->pid = getpid ();
-- cred->uid = getuid ();
-- cred->gid = getgid ();
++
++ DEBUG ("send credentials");
++ fd = GIBBER_FD_TRANSPORT (transport)->fd;
++
++ /* Set the message payload */
++ memset (&iov, 0, sizeof (iov));
++ iov.iov_base = (void *) data;
++ iov.iov_len = size;
++
++ memset (&msg, 0, sizeof (msg));
++ msg.msg_iov = &iov;
++ msg.msg_iovlen = 1;
+ msg.msg_control = (caddr_t) &cmsg;
+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+ memset (&cmsg, 0, sizeof (cmsg));
+ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+ cmsg.hdr.cmsg_level = SOL_SOCKET;
+ cmsg.hdr.cmsg_type = SCM_CREDS;
-
- ret = sendmsg (fd, &msg, 0);
- if (ret == -1)
-@@ -256,9 +250,11 @@ gibber_unix_transport_read (GibberFdTran
- GibberBuffer buf;
- struct iovec iov;
- struct msghdr msg;
-- char control[CMSG_SPACE (sizeof (struct ucred))];
-- struct cmsghdr *ch;
-- struct ucred *cred;
++
++ ret = sendmsg (fd, &msg, 0);
++ if (ret == -1)
++ {
++ DEBUG ("sendmsg failed: %s", g_strerror (errno));
++ return FALSE;
++ }
++
++ return TRUE;
++}
++
++gboolean
++gibber_unix_transport_recv_credentials (GibberUnixTransport *self,
++ GibberUnixTransportRecvCredentialsCb callback,
++ gpointer user_data)
++{
++ GibberUnixTransportPrivate *priv = GIBBER_UNIX_TRANSPORT_GET_PRIVATE (self);
++
++ if (priv->recv_creds_cb != NULL)
++ {
++ DEBUG ("already waiting for credentials");
++ return FALSE;
++ }
++
++ priv->recv_creds_cb = callback;
++ priv->recv_creds_data = user_data;
++ return TRUE;
++}
++
++gboolean
++gibber_unix_transport_supports_credentials (void)
++{
++ return TRUE;
++}
++
++#define BUFSIZE 1024
++
++static GibberFdIOResult
++gibber_unix_transport_read (GibberFdTransport *transport,
++ GIOChannel *channel,
++ GError **error)
++{
++ GibberUnixTransport *self = GIBBER_UNIX_TRANSPORT (transport);
++ GibberUnixTransportPrivate *priv = GIBBER_UNIX_TRANSPORT_GET_PRIVATE (self);
++ int fd;
++ guint8 buffer[BUFSIZE];
++ ssize_t bytes_read;
++ GibberBuffer buf;
++ struct iovec iov;
++ struct msghdr msg;
+ struct cmsgcred *cred;
+ union {
-+ struct cmsghdr hdr;
-+ char cred[CMSG_SPACE (sizeof *cred)];
++ struct cmsghdr hdr;
++ char cred[CMSG_SPACE (sizeof *cred)];
+ } cmsg;
- int opt;
-
- if (priv->recv_creds_cb == NULL)
-@@ -268,8 +264,10 @@ gibber_unix_transport_read (GibberFdTran
- fd = transport->fd;
-
- /* set SO_PASSCRED flag */
-+#ifdef SO_PASSCRED
- opt = 1;
- setsockopt (fd, SOL_SOCKET, SO_PASSCRED, &opt, sizeof (opt));
-+#endif
-
- memset (buffer, 0, sizeof (buffer));
- memset (&iov, 0, sizeof (iov));
-@@ -279,8 +277,8 @@ gibber_unix_transport_read (GibberFdTran
- memset (&msg, 0, sizeof (msg));
- msg.msg_iov = &iov;
- msg.msg_iovlen = 1;
-- msg.msg_control = control;
-- msg.msg_controllen = sizeof (control);
++ int opt;
++
++ if (priv->recv_creds_cb == NULL)
++ return gibber_fd_transport_read (transport, channel, error);
++
++ /* We are waiting for credentials */
++ fd = transport->fd;
++
++ memset (buffer, 0, sizeof (buffer));
++ memset (&iov, 0, sizeof (iov));
++ iov.iov_base = buffer;
++ iov.iov_len = sizeof (buffer);
++
++ memset (&msg, 0, sizeof (msg));
++ msg.msg_iov = &iov;
++ msg.msg_iovlen = 1;
+ msg.msg_control = (caddr_t) &cmsg;
+ msg.msg_controllen = CMSG_SPACE (sizeof *cred);
-
- bytes_read = recvmsg (fd, &msg, 0);
-
-@@ -300,15 +298,17 @@ gibber_unix_transport_read (GibberFdTran
- }
-
- /* unset SO_PASSCRED flag */
-+#ifdef SO_PASSCRED
- opt = 0;
- setsockopt (fd, SOL_SOCKET, SO_PASSCRED, &opt, sizeof (opt));
-+#endif
-
- buf.data = buffer;
- buf.length = bytes_read;
-
- /* extract the credentials */
-- ch = CMSG_FIRSTHDR (&msg);
-- if (ch == NULL)
++
++ bytes_read = recvmsg (fd, &msg, 0);
++
++ if (bytes_read == -1)
++ {
++ GError *err = NULL;
++
++ g_set_error_literal (&err, G_IO_CHANNEL_ERROR,
++ g_io_channel_error_from_errno (errno), "recvmsg failed");
++
++ priv->recv_creds_cb (self, NULL, NULL, err, priv->recv_creds_data);
++ g_propagate_error (error, err);
++
++ priv->recv_creds_cb = NULL;
++ priv->recv_creds_data = NULL;
++ return GIBBER_FD_IO_RESULT_ERROR;
++ }
++
++ buf.data = buffer;
++ buf.length = bytes_read;
++
++ /* extract the credentials */
+ if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof *cred) ||
+ cmsg.hdr.cmsg_type != SCM_CREDS)
- {
- GError *err = NULL;
-
-@@ -325,10 +325,10 @@ gibber_unix_transport_read (GibberFdTran
- {
- GibberCredentials credentials;
-
-- cred = (struct ucred *) CMSG_DATA (ch);
-- credentials.pid = cred->pid;
-- credentials.uid = cred->uid;
-- credentials.gid = cred->gid;
++ {
++ GError *err = NULL;
++
++ DEBUG ("Message doesn't contain credentials");
++
++ g_set_error_literal (&err, GIBBER_UNIX_TRANSPORT_ERROR,
++ GIBBER_UNIX_TRANSPORT_ERROR_NO_CREDENTIALS,
++ "no credentials received");
++
++ priv->recv_creds_cb (self, &buf, NULL, err, priv->recv_creds_data);
++ g_error_free (err);
++ }
++ else
++ {
++ GibberCredentials credentials;
++
+ cred = (struct cmsgcred *) CMSG_DATA (&cmsg.hdr);
+ credentials.pid = cred->cmcred_pid;
+ credentials.uid = cred->cmcred_uid;
+ credentials.gid = cred->cmcred_gid;
++
++ priv->recv_creds_cb (self, &buf, &credentials, NULL,
++ priv->recv_creds_data);
++ }
++
++ priv->recv_creds_cb = NULL;
++ priv->recv_creds_data = NULL;
++ return GIBBER_FD_IO_RESULT_SUCCESS;
++}
++
++/* End FreeBSD part */
+ #else /* OSs where we have no implementation */
- priv->recv_creds_cb (self, &buf, &credentials, NULL,
- priv->recv_creds_data);
+ gboolean
+@@ -393,9 +554,7 @@ gibber_unix_transport_recv_credentials (
+ }
+
+ gboolean
+-gibber_unix_transport_send_credentials (GibberUnixTransport *transport,
+- const guint8 *data,
+- gsize size)
++gibber_unix_transport_send_credentials (void)
+ {
+ DEBUG ("stub implementation, failing");
+ return FALSE;
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-util.h b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-util.h
deleted file mode 100644
index e690611c3af5..000000000000
--- a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-util.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/gibber/gibber-util.h.orig 2009-01-08 01:55:08.000000000 -0500
-+++ lib/gibber/gibber-util.h 2009-01-08 01:56:05.000000000 -0500
-@@ -20,6 +20,9 @@
- #ifndef __GIBBER_UTIL_H__
- #define __GIBBER_UTIL_H__
-
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- #include <netdb.h>
-
- #include <glib.h>
diff --git a/net-im/telepathy-gabble/files/patch-src_bytestream-socks5.c b/net-im/telepathy-gabble/files/patch-src_bytestream-socks5.c
deleted file mode 100644
index 07bf4c2ab63c..000000000000
--- a/net-im/telepathy-gabble/files/patch-src_bytestream-socks5.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bytestream-socks5.c.orig 2009-01-08 01:57:01.000000000 -0500
-+++ src/bytestream-socks5.c 2009-01-08 01:57:20.000000000 -0500
-@@ -21,6 +21,8 @@
- #include "config.h"
- #include "bytestream-socks5.h"
-
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <arpa/inet.h>
- #include <errno.h>
- #include <fcntl.h>
diff --git a/net-im/telepathy-gabble/files/patch-src_jingle-factory.c b/net-im/telepathy-gabble/files/patch-src_jingle-factory.c
deleted file mode 100644
index 6f75e4951b3a..000000000000
--- a/net-im/telepathy-gabble/files/patch-src_jingle-factory.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/jingle-factory.c.orig 2009-03-08 13:03:05.000000000 -0400
-+++ src/jingle-factory.c 2009-03-08 13:04:05.000000000 -0400
-@@ -20,6 +20,10 @@
-
- #include "jingle-factory.h"
-
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/net-im/telepathy-gabble/files/patch-src_tube-stream.c b/net-im/telepathy-gabble/files/patch-src_tube-stream.c
deleted file mode 100644
index 9118a52ade02..000000000000
--- a/net-im/telepathy-gabble/files/patch-src_tube-stream.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/tube-stream.c.orig 2008-01-17 01:49:11.000000000 -0500
-+++ src/tube-stream.c 2008-01-17 01:49:22.000000000 -0500
-@@ -24,6 +24,7 @@
- #include <time.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <sys/un.h>
- #include <unistd.h>
- #include <fcntl.h>
diff --git a/net-im/telepathy-gabble/pkg-plist b/net-im/telepathy-gabble/pkg-plist
index fff4ba5c0364..2bd653be6e31 100644
--- a/net-im/telepathy-gabble/pkg-plist
+++ b/net-im/telepathy-gabble/pkg-plist
@@ -1,4 +1,6 @@
libexec/telepathy-gabble
+lib/telepathy/gabble-0/gateways.la
+lib/telepathy/gabble-0/gateways.so
share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.gabble.service
%%DOCSDIR%%/muc-bytestream.html
%%DOCSDIR%%/olpc.html
@@ -8,3 +10,5 @@ share/telepathy/managers/gabble.manager
@dirrmtry share/telepathy/managers
@dirrmtry share/telepathy
@dirrm %%DOCSDIR%%
+@dirrm lib/telepathy/gabble-0
+@dirrmtry lib/telepathy
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index e43c712f3c1b..1a36953a3750 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -3,10 +3,10 @@
# Whom: Florent Thoumie <flz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net-im/telepathy-glib/Makefile,v 1.4 2008/03/20 02:57:19 marcus Exp $
+# $MCom: ports/net-im/telepathy-glib/Makefile,v 1.15 2010/10/21 17:35:24 kwm Exp $
PORTNAME= telepathy-glib
-PORTVERSION= 0.10.7
+PORTVERSION= 0.12.1
CATEGORIES= net-im
MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
@@ -16,10 +16,13 @@ COMMENT= GLib utility library for the Telepathy framework
LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \
dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
-BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \
+ vapigen-0.10:${PORTSDIR}/lang/vala-vapigen \
+ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
+RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} \
+ vapigen-0.10:${PORTSDIR}/lang/vala-vapigen
USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
@@ -27,9 +30,12 @@ USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig glib20 ltverhack
USE_PYTHON_BUILD= yes
MAKE_JOBS_UNSAFE= yes
+CONFIGURE_ARGS= --enable-vala-bindings
post-patch:
@${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \
${WRKSRC}/telepathy-glib/Makefile.in
+ @${REINPLACE_CMD} -e 's|datarootdir)/vala/vapi|datarootdir)/vala-0.10/vapi|g' \
+ ${WRKSRC}/vala/Makefile.in
.include <bsd.port.mk>
diff --git a/net-im/telepathy-glib/distinfo b/net-im/telepathy-glib/distinfo
index cb5657f2669d..e1c9e5bd7893 100644
--- a/net-im/telepathy-glib/distinfo
+++ b/net-im/telepathy-glib/distinfo
@@ -1,3 +1,3 @@
-MD5 (telepathy-glib-0.10.7.tar.gz) = 811c375416bc4f0fab4b870eb936ded4
-SHA256 (telepathy-glib-0.10.7.tar.gz) = 92b0de059ff3bcec08d16fe31456aecd8fe8f5973504e1ac45b28fed8b41307a
-SIZE (telepathy-glib-0.10.7.tar.gz) = 2090298
+MD5 (telepathy-glib-0.12.1.tar.gz) = b3c0e84b7f1f0709dfd8eed56455a80d
+SHA256 (telepathy-glib-0.12.1.tar.gz) = 3ae79c7664766c8217c44e1ed8e1e91655983f704713dff6e4e1747abc3440e3
+SIZE (telepathy-glib-0.12.1.tar.gz) = 2554755
diff --git a/net-im/telepathy-glib/pkg-plist b/net-im/telepathy-glib/pkg-plist
index 3058eed4ae39..6295b7ff9285 100644
--- a/net-im/telepathy-glib/pkg-plist
+++ b/net-im/telepathy-glib/pkg-plist
@@ -1,4 +1,5 @@
include/telepathy-1.0/telepathy-glib/_gen/error-str.h
+include/telepathy-1.0/telepathy-glib/_gen/genums.h
include/telepathy-1.0/telepathy-glib/_gen/gtypes.h
include/telepathy-1.0/telepathy-glib/_gen/telepathy-enums.h
include/telepathy-1.0/telepathy-glib/_gen/telepathy-interfaces.h
@@ -15,6 +16,7 @@ include/telepathy-1.0/telepathy-glib/_gen/tp-cli-dbus-daemon.h
include/telepathy-1.0/telepathy-glib/_gen/tp-cli-generic.h
include/telepathy-1.0/telepathy-glib/_gen/tp-cli-media-session-handler.h
include/telepathy-1.0/telepathy-glib/_gen/tp-cli-media-stream-handler.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-cli-protocol.h
include/telepathy-1.0/telepathy-glib/_gen/tp-svc-account-manager.h
include/telepathy-1.0/telepathy-glib/_gen/tp-svc-account.h
include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel-dispatch-operation.h
@@ -28,10 +30,18 @@ include/telepathy-1.0/telepathy-glib/_gen/tp-svc-debug.h
include/telepathy-1.0/telepathy-glib/_gen/tp-svc-generic.h
include/telepathy-1.0/telepathy-glib/_gen/tp-svc-media-session-handler.h
include/telepathy-1.0/telepathy-glib/_gen/tp-svc-media-stream-handler.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-svc-protocol.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-svc-tls-cert.h
+include/telepathy-1.0/telepathy-glib/account-channel-request.h
include/telepathy-1.0/telepathy-glib/account-manager.h
include/telepathy-1.0/telepathy-glib/account.h
+include/telepathy-1.0/telepathy-glib/add-dispatch-operation-context.h
+include/telepathy-1.0/telepathy-glib/base-channel.h
+include/telepathy-1.0/telepathy-glib/base-client.h
include/telepathy-1.0/telepathy-glib/base-connection-manager.h
include/telepathy-1.0/telepathy-glib/base-connection.h
+include/telepathy-1.0/telepathy-glib/base-protocol.h
+include/telepathy-1.0/telepathy-glib/capabilities.h
include/telepathy-1.0/telepathy-glib/channel-dispatch-operation.h
include/telepathy-1.0/telepathy-glib/channel-dispatcher.h
include/telepathy-1.0/telepathy-glib/channel-factory-iface.h
@@ -54,8 +64,10 @@ include/telepathy-1.0/telepathy-glib/defs.h
include/telepathy-1.0/telepathy-glib/enums.h
include/telepathy-1.0/telepathy-glib/errors.h
include/telepathy-1.0/telepathy-glib/exportable-channel.h
+include/telepathy-1.0/telepathy-glib/gnio-util.h
include/telepathy-1.0/telepathy-glib/group-mixin.h
include/telepathy-1.0/telepathy-glib/gtypes.h
+include/telepathy-1.0/telepathy-glib/handle-channels-context.h
include/telepathy-1.0/telepathy-glib/handle-repo-dynamic.h
include/telepathy-1.0/telepathy-glib/handle-repo-static.h
include/telepathy-1.0/telepathy-glib/handle-repo.h
@@ -65,11 +77,16 @@ include/telepathy-1.0/telepathy-glib/interfaces.h
include/telepathy-1.0/telepathy-glib/intset.h
include/telepathy-1.0/telepathy-glib/media-interfaces.h
include/telepathy-1.0/telepathy-glib/message-mixin.h
+include/telepathy-1.0/telepathy-glib/observe-channels-context.h
include/telepathy-1.0/telepathy-glib/presence-mixin.h
include/telepathy-1.0/telepathy-glib/properties-mixin.h
+include/telepathy-1.0/telepathy-glib/protocol.h
include/telepathy-1.0/telepathy-glib/proxy-subclass.h
include/telepathy-1.0/telepathy-glib/proxy.h
include/telepathy-1.0/telepathy-glib/run.h
+include/telepathy-1.0/telepathy-glib/simple-approver.h
+include/telepathy-1.0/telepathy-glib/simple-handler.h
+include/telepathy-1.0/telepathy-glib/simple-observer.h
include/telepathy-1.0/telepathy-glib/svc-account-manager.h
include/telepathy-1.0/telepathy-glib/svc-account.h
include/telepathy-1.0/telepathy-glib/svc-channel-dispatch-operation.h
@@ -83,15 +100,20 @@ include/telepathy-1.0/telepathy-glib/svc-debug.h
include/telepathy-1.0/telepathy-glib/svc-generic.h
include/telepathy-1.0/telepathy-glib/svc-media-interfaces.h
include/telepathy-1.0/telepathy-glib/svc-properties-interface.h
+include/telepathy-1.0/telepathy-glib/svc-protocol.h
+include/telepathy-1.0/telepathy-glib/svc-tls.h
include/telepathy-1.0/telepathy-glib/telepathy-glib.h
include/telepathy-1.0/telepathy-glib/text-mixin.h
include/telepathy-1.0/telepathy-glib/util.h
include/telepathy-1.0/telepathy-glib/verify.h
+lib/girepository-1.0/TelepathyGLib-0.12.typelib
lib/libtelepathy-glib.a
lib/libtelepathy-glib.la
lib/libtelepathy-glib.so
lib/libtelepathy-glib.so.0
libdata/pkgconfig/telepathy-glib.pc
+share/gir-1.0/TelepathyGLib-0.12.gir
+share/gtk-doc/html/telepathy-glib/TpBaseChannel.html
share/gtk-doc/html/telepathy-glib/TpBaseConnection.html
share/gtk-doc/html/telepathy-glib/TpBaseConnectionManager.html
share/gtk-doc/html/telepathy-glib/TpChannelFactoryIface.html
@@ -100,6 +122,7 @@ share/gtk-doc/html/telepathy-glib/TpChannelManager.html
share/gtk-doc/html/telepathy-glib/TpExportableChannel.html
share/gtk-doc/html/telepathy-glib/TpDynamicHandleRepo.html
share/gtk-doc/html/telepathy-glib/TpStaticHandleRepo.html
+share/gtk-doc/html/telepathy-glib/annotation-glossary.html
share/gtk-doc/html/telepathy-glib/ch-client.html
share/gtk-doc/html/telepathy-glib/ch-dbus.html
share/gtk-doc/html/telepathy-glib/ch-protocol.html
@@ -116,14 +139,20 @@ share/gtk-doc/html/telepathy-glib/style.css
share/gtk-doc/html/telepathy-glib/telepathy-glib-TpContactsMixin.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-TpGroupMixin.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-TpHeap.html
-share/gtk-doc/html/telepathy-glib/telepathy-glib-TpIntSet.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-TpIntset.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-TpMessageMixin.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-TpPresenceMixin.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-TpPropertiesMixin.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-TpTextMixin.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-account-channel-request.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-add-dispatch-operation-context.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-asv.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-account-manager.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-account.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-base-client.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-base-protocol.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-capabilities.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-contactsearch.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-dispatch-operation.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-dispatcher.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-file-transfer.html
@@ -135,11 +164,17 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-text.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-tube.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-tubes.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-anonymity.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-service-point.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-client.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-aliasing.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-avatars.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-balance.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-caps.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-cellular.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-contact-info.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-contacts.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-location.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-manager.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-presence.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-requests.html
@@ -154,19 +189,28 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-debug.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-defs.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-errors.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-gnio-util.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-gtypes.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-handle-channels-context.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-handle-repo.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-handle.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-interfaces.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-media-interfaces.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-observe-channels-context.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-protocol.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy-dbus-core.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy-subclass.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy-tp-properties.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-run.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-approver.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-handler.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-observer.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-account-manager.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-account.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-anonymity.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-contactlist.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-contactsearch.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-dispatch-operation.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-dispatcher.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-file-transfer.html
@@ -184,14 +228,21 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-connection.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-debug.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-generic.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-media-interfaces.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-service-point.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-tls.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-protocol.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-util.html
share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp
share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp2
share/gtk-doc/html/telepathy-glib/up.png
+share/vala-0.10/vapi/telepathy-glib.deps
+share/vala-0.10/vapi/telepathy-glib.vapi
@dirrm share/gtk-doc/html/telepathy-glib
@dirrmtry share/gtk-doc/html
@dirrmtry share/gtk-doc
@dirrm include/telepathy-1.0/telepathy-glib/_gen
@dirrm include/telepathy-1.0/telepathy-glib
@dirrmtry include/telepathy-1.0
+@dirrmtry lib/girepository-1.0
+@dirrmtry share/gir-1.0
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
new file mode 100644
index 000000000000..1691f790f21d
--- /dev/null
+++ b/net-im/telepathy-logger/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for: telepathy-logger
+# Date created: 23 July 2010
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/net-im/telepathy-logger/Makefile,v 1.3 2010/09/01 23:50:23 avl Exp $
+
+PORTNAME= telepathy-logger
+PORTVERSION= 0.1.5
+PORTREVISION= 1
+CATEGORIES= net-im
+MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Logger utility library for the Telepathy framework
+
+BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+ xml2.5:${PORTSDIR}/textproc/libxml2 \
+ telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
+ sqlite3.8:${PORTSDIR}/databases/sqlite3
+
+USE_BZIP2= yes
+USE_AUTOTOOLS= libtool:22
+USE_GMAKE= yes
+USE_LDCONFIG= yes
+USE_GNOME= gnomehack pkgconfig glib20 intltool gnomedocutils ltverhack
+USE_PYTHON_BUILD= yes
+#MAKE_JOBS_UNSAFE= yes
+GLIB_SCHEMAS= org.freedesktop.Telepathy.Logger.gschema.xml
+
+#post-patch:
+# @${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \
+# ${WRKSRC}/telepathy-glib/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/net-im/telepathy-logger/distinfo b/net-im/telepathy-logger/distinfo
new file mode 100644
index 000000000000..7bc4e3f9c6bd
--- /dev/null
+++ b/net-im/telepathy-logger/distinfo
@@ -0,0 +1,3 @@
+MD5 (telepathy-logger-0.1.5.tar.bz2) = 6e41a5c6b323a337085b9519ac557fb7
+SHA256 (telepathy-logger-0.1.5.tar.bz2) = 0b2e4f402531a607c5322c2fbcd0fd61a96f6b933c726430dafefa03f580bec8
+SIZE (telepathy-logger-0.1.5.tar.bz2) = 448552
diff --git a/net-im/telepathy-logger/files/patch-configure b/net-im/telepathy-logger/files/patch-configure
new file mode 100644
index 000000000000..ce4c818f908c
--- /dev/null
+++ b/net-im/telepathy-logger/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig 2010-08-18 14:48:05.000000000 +0200
++++ configure 2010-08-18 14:49:13.000000000 +0200
+@@ -13281,8 +13281,8 @@
+ .SECONDARY: $(gsettings_SCHEMAS)
+
+ gsettings__base_list = \
+- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
diff --git a/net-im/telepathy-logger/pkg-descr b/net-im/telepathy-logger/pkg-descr
new file mode 100644
index 000000000000..9d04383569a1
--- /dev/null
+++ b/net-im/telepathy-logger/pkg-descr
@@ -0,0 +1,3 @@
+Logger utility library for the Teleparthy framwork.
+
+WWW: http://telepathy.freedesktop.org/
diff --git a/net-im/telepathy-logger/pkg-plist b/net-im/telepathy-logger/pkg-plist
new file mode 100644
index 000000000000..983770d4dd69
--- /dev/null
+++ b/net-im/telepathy-logger/pkg-plist
@@ -0,0 +1,35 @@
+include/telepathy-logger-0.1/telepathy-logger/entity.h
+include/telepathy-logger-0.1/telepathy-logger/entry-text.h
+include/telepathy-logger-0.1/telepathy-logger/entry.h
+include/telepathy-logger-0.1/telepathy-logger/log-manager.h
+include/telepathy-logger-0.1/telepathy-logger/telepathy-logger.h
+lib/libtelepathy-logger.a
+lib/libtelepathy-logger.la
+lib/libtelepathy-logger.so
+lib/libtelepathy-logger.so.1
+libdata/pkgconfig/telepathy-logger-0.1.pc
+libexec/telepathy-logger
+share/dbus-1/services/org.freedesktop.Telepathy.Client.Logger.service
+share/dbus-1/services/org.freedesktop.Telepathy.Logger.service
+share/gtk-doc/html/telepathy-logger/TplEntry.html
+share/gtk-doc/html/telepathy-logger/TplEntryText.html
+share/gtk-doc/html/telepathy-logger/ch-public.html
+share/gtk-doc/html/telepathy-logger/home.png
+share/gtk-doc/html/telepathy-logger/index.html
+share/gtk-doc/html/telepathy-logger/index.sgml
+share/gtk-doc/html/telepathy-logger/left.png
+share/gtk-doc/html/telepathy-logger/right.png
+share/gtk-doc/html/telepathy-logger/style.css
+share/gtk-doc/html/telepathy-logger/telepathy-logger-TplEntity.html
+share/gtk-doc/html/telepathy-logger/telepathy-logger-TplLogManager.html
+share/gtk-doc/html/telepathy-logger/telepathy-logger.devhelp
+share/gtk-doc/html/telepathy-logger/telepathy-logger.devhelp2
+share/gtk-doc/html/telepathy-logger/up.png
+share/telepathy/clients/Logger.client
+@dirrmtry share/telepathy/clients
+@dirrmtry share/telepathy
+@dirrm share/gtk-doc/html/telepathy-logger
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
+@dirrm include/telepathy-logger-0.1/telepathy-logger
+@dirrm include/telepathy-logger-0.1
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 672083f7eb46..1647eed92fe5 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -3,10 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.11 2010/04/23 17:01:23 marcus Exp $
+# $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.14 2010/09/22 12:13:31 avl Exp $
PORTNAME= telepathy-mission-control
-PORTVERSION= 5.3.2
+PORTVERSION= 5.6.0
+PORTREVISION= 1
CATEGORIES= net-im devel
MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-mission-control/
@@ -23,7 +24,7 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE=yes
-MAN1= mc-account-convert.1 mc-tool.1 mc-wait-for-name.1
+MAN1= mc-tool.1 mc-wait-for-name.1
MAN8= mission-control-5.8
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/net-im/telepathy-mission-control/distinfo b/net-im/telepathy-mission-control/distinfo
index 4ea4a99ec00d..ef1dc6a2146c 100644
--- a/net-im/telepathy-mission-control/distinfo
+++ b/net-im/telepathy-mission-control/distinfo
@@ -1,3 +1,3 @@
-MD5 (telepathy-mission-control-5.3.2.tar.gz) = 4aca1025905c23bdcc2e6a55d69644e3
-SHA256 (telepathy-mission-control-5.3.2.tar.gz) = a1bf76add06f3938a939d9c296eb6b90df77bac7819ca583df313e954bf52d2a
-SIZE (telepathy-mission-control-5.3.2.tar.gz) = 1112677
+MD5 (telepathy-mission-control-5.6.0.tar.gz) = 597f693cd506c2a800153c36082b29cb
+SHA256 (telepathy-mission-control-5.6.0.tar.gz) = 9423dffaf35826d34028c2f4b3ddc8d34099d04b4f2579d59ae6726b6c4d876e
+SIZE (telepathy-mission-control-5.6.0.tar.gz) = 1298241
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
deleted file mode 100644
index c599bea27191..000000000000
--- a/net-im/telepathy-mission-control/files/patch-util_mc-tool.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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 00187ce891ec..2185201acab3 100644
--- a/net-im/telepathy-mission-control/pkg-plist
+++ b/net-im/telepathy-mission-control/pkg-plist
@@ -1,72 +1,46 @@
-bin/mc-account-convert
bin/mc-tool
bin/mc-wait-for-name
-include/libmcclient/_gen/cli-account-manager.h
-include/libmcclient/_gen/cli-account.h
-include/libmcclient/_gen/cli-dispatch-operation.h
-include/libmcclient/_gen/enums.h
-include/libmcclient/_gen/gtypes.h
-include/libmcclient/_gen/interfaces.h
-include/libmcclient/_gen/mc-quark.h
-include/libmcclient/_gen/svc-client.h
-include/libmcclient/dbus-api.h
-include/libmcclient/mc-account-manager.h
-include/libmcclient/mc-account.h
-include/libmcclient/mc-dispatch-operation.h
-include/libmcclient/mc-enums.h
-include/libmcclient/mc-errors.h
-include/libmcclient/mc-gtypes.h
-include/libmcclient/mc-interfaces.h
-include/libmcclient/mc-profile.h
-include/libmcclient/mc-signals-marshal.h
-include/libmcclient/mc-svc-client.h
-lib/libmcclient.a
-lib/libmcclient.la
-lib/libmcclient.so
-lib/libmcclient-%%VERSION%%.so
-libdata/pkgconfig/libmcclient.pc
+include/mission-control-5.5/mission-control-plugins/account-storage.h
+include/mission-control-5.5/mission-control-plugins/account.h
+include/mission-control-5.5/mission-control-plugins/dbus-acl.h
+include/mission-control-5.5/mission-control-plugins/dispatch-operation-policy.h
+include/mission-control-5.5/mission-control-plugins/dispatch-operation.h
+include/mission-control-5.5/mission-control-plugins/loader.h
+include/mission-control-5.5/mission-control-plugins/mcp-signals-marshal.h
+include/mission-control-5.5/mission-control-plugins/mission-control-plugins.h
+include/mission-control-5.5/mission-control-plugins/request-policy.h
+include/mission-control-5.5/mission-control-plugins/request.h
+lib/libmission-control-plugins.a
+lib/libmission-control-plugins.la
+lib/libmission-control-plugins.so
+lib/libmission-control-plugins.so.0
+libdata/pkgconfig/mission-control-plugins.pc
libexec/mission-control-5
share/dbus-1/services/org.freedesktop.Telepathy.AccountManager.service
share/dbus-1/services/org.freedesktop.Telepathy.MissionControl5.service
-share/doc/libmcclient/McProfile.html
-share/doc/libmcclient/ch-account-manager.html
-share/doc/libmcclient/ch-account.html
-share/doc/libmcclient/ch-profile.html
-share/doc/libmcclient/home.png
-share/doc/libmcclient/index.html
-share/doc/libmcclient/index.sgml
-share/doc/libmcclient/left.png
-share/doc/libmcclient/libmcclient-mc-account-manager.html
-share/doc/libmcclient/libmcclient-mc-account.html
-share/doc/libmcclient/libmcclient.devhelp
-share/doc/libmcclient/libmcclient.devhelp2
-share/doc/libmcclient/right.png
-share/doc/libmcclient/style.css
-share/doc/libmcclient/up.png
-share/doc/libmissioncontrol-server/McdChannel.html
-share/doc/libmissioncontrol-server/McdController.html
-share/doc/libmissioncontrol-server/McdDispatcher.html
-share/doc/libmissioncontrol-server/McdManager.html
-share/doc/libmissioncontrol-server/McdMaster.html
-share/doc/libmissioncontrol-server/McdMission.html
-share/doc/libmissioncontrol-server/McdOperation.html
-share/doc/libmissioncontrol-server/McdProxy.html
-share/doc/libmissioncontrol-server/McdService.html
-share/doc/libmissioncontrol-server/ch01.html
-share/doc/libmissioncontrol-server/home.png
-share/doc/libmissioncontrol-server/index.html
-share/doc/libmissioncontrol-server/index.sgml
-share/doc/libmissioncontrol-server/left.png
-share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-connection.html
-share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-debug.html
-share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-dispatcher-context.html
-share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-enum-types.html
-share/doc/libmissioncontrol-server/libmissioncontrol-server.devhelp
-share/doc/libmissioncontrol-server/libmissioncontrol-server.devhelp2
-share/doc/libmissioncontrol-server/right.png
-share/doc/libmissioncontrol-server/style.css
-share/doc/libmissioncontrol-server/up.png
-@dirrm share/doc/libmissioncontrol-server
-@dirrm share/doc/libmcclient
-@dirrm include/libmcclient/_gen
-@dirrm include/libmcclient
+share/doc/mission-control-plugins/McpAccountStorage.html
+share/doc/mission-control-plugins/McpDispatchOperation.html
+share/doc/mission-control-plugins/McpDispatchOperationPolicy.html
+share/doc/mission-control-plugins/McpRequest.html
+share/doc/mission-control-plugins/McpRequestPolicy.html
+share/doc/mission-control-plugins/api-index-full.html
+share/doc/mission-control-plugins/ch01.html
+share/doc/mission-control-plugins/ch02.html
+share/doc/mission-control-plugins/ch03.html
+share/doc/mission-control-plugins/ch04.html
+share/doc/mission-control-plugins/home.png
+share/doc/mission-control-plugins/index.html
+share/doc/mission-control-plugins/index.sgml
+share/doc/mission-control-plugins/left.png
+share/doc/mission-control-plugins/mission-control-plugins-Plugin-loader-and-global-functions.html
+share/doc/mission-control-plugins/mission-control-plugins-account.html
+share/doc/mission-control-plugins/mission-control-plugins.devhelp
+share/doc/mission-control-plugins/mission-control-plugins.devhelp2
+share/doc/mission-control-plugins/object-tree.html
+share/doc/mission-control-plugins/right.png
+share/doc/mission-control-plugins/style.css
+share/doc/mission-control-plugins/up.png
+@dirrm share/doc/mission-control-plugins
+@dirrm include/mission-control-5.5/mission-control-plugins
+@dirrm include/mission-control-5.5
+@dirrmtry lib/mission-control-plugins.0