Update the telepathy stack.

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

16 files changed, 22 insertions, 64 deletions

diff --git a/net-im/telepathy-farstream/Makefile b/net-im/telepathy-farstream/Makefile
index 39a815d3b..d1a9b4c43 100644
--- a/net-im/telepathy-farstream/Makefile
+++ b/net-im/telepathy-farstream/Makefile
@@ -3,8 +3,7 @@
 #    $MCom$
 
 PORTNAME=	telepathy-farstream
-PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTVERSION=	0.6.2
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
diff --git a/net-im/telepathy-farstream/distinfo b/net-im/telepathy-farstream/distinfo
index 96f3d2f9c..323383d7b 100644
--- a/net-im/telepathy-farstream/distinfo
+++ b/net-im/telepathy-farstream/distinfo
@@ -1,2 +1,2 @@
-SHA256 (telepathy-farstream-0.6.1.tar.gz) = a3d26f37ae0e60c40ce9607a3cf411353307258b4a984cef66c1aade1bb54845
-SIZE (telepathy-farstream-0.6.1.tar.gz) = 601129
+SHA256 (telepathy-farstream-0.6.2.tar.gz) = 6fa099f22d13a2a49240445a13e918928aef097675d76e5cc9f98ab496087e0a
+SIZE (telepathy-farstream-0.6.2.tar.gz) = 601409
diff --git a/net-im/telepathy-farstream/pkg-plist b/net-im/telepathy-farstream/pkg-plist
index 1cae0f311..7c24f4706 100644
--- a/net-im/telepathy-farstream/pkg-plist
+++ b/net-im/telepathy-farstream/pkg-plist
@@ -19,8 +19,3 @@ share/gtk-doc/html/telepathy-farstream/right.png
 share/gtk-doc/html/telepathy-farstream/style.css
 share/gtk-doc/html/telepathy-farstream/telepathy-farstream.devhelp2
 share/gtk-doc/html/telepathy-farstream/up.png
-@dirrm share/gtk-doc/html/telepathy-farstream
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
-@dirrm include/telepathy-1.0/telepathy-farstream
-
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index 01ed07f46..ec89131ca 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -3,17 +3,16 @@
 #   $MCom$
 
 PORTNAME=	telepathy-glib
-PORTVERSION=	0.24.0
-PORTREVISION=	1
+PORTVERSION=	0.24.1
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib utility library for the Telepathy framework
 
-BUILD_DEPENDS=	vala-vapigen>=0.20.0:${PORTSDIR}/lang/vala-vapigen
+BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	vapigen:${PORTSDIR}/lang/vala-vapigen
+RUN_DEPENDS=	vapigen:${PORTSDIR}/lang/vala
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/net-im/telepathy-glib/distinfo b/net-im/telepathy-glib/distinfo
index a63d3bffd..58d67d4c1 100644
--- a/net-im/telepathy-glib/distinfo
+++ b/net-im/telepathy-glib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (telepathy-glib-0.24.0.tar.gz) = ae0002134991217f42e503c43dea7817853afc18863b913744d51ffa029818cf
-SIZE (telepathy-glib-0.24.0.tar.gz) = 3890992
+SHA256 (telepathy-glib-0.24.1.tar.gz) = 9e0df1d8f857e0270cf0b32e2d1ca5a24aa7282873361785d573f72ad7f7d5eb
+SIZE (telepathy-glib-0.24.1.tar.gz) = 3898149
diff --git a/net-im/telepathy-glib/pkg-plist b/net-im/telepathy-glib/pkg-plist
index 6d339fbfc..23025de25 100644
--- a/net-im/telepathy-glib/pkg-plist
+++ b/net-im/telepathy-glib/pkg-plist
@@ -208,9 +208,7 @@ share/gtk-doc/html/telepathy-glib/ch-utilities.html
 share/gtk-doc/html/telepathy-glib/home.png
 share/gtk-doc/html/telepathy-glib/index.html
 share/gtk-doc/html/telepathy-glib/index.sgml
-share/gtk-doc/html/telepathy-glib/left-insensitive.png
 share/gtk-doc/html/telepathy-glib/left.png
-share/gtk-doc/html/telepathy-glib/right-insensitive.png
 share/gtk-doc/html/telepathy-glib/right.png
 share/gtk-doc/html/telepathy-glib/style.css
 share/gtk-doc/html/telepathy-glib/telepathy-glib-TpContactsMixin.html
@@ -354,13 +352,6 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-vardict.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-variant-util.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-version.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp2
-share/gtk-doc/html/telepathy-glib/up-insensitive.png
 share/gtk-doc/html/telepathy-glib/up.png
 share/vala/vapi/telepathy-glib.deps
 share/vala/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
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index c96e349e6..2d86357bf 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -3,8 +3,7 @@
 #    $MCom$
 
 PORTNAME=	telepathy-logger
-PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTVERSION=	0.8.1
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
diff --git a/net-im/telepathy-logger/distinfo b/net-im/telepathy-logger/distinfo
index 2dd60e49c..c076cb1a2 100644
--- a/net-im/telepathy-logger/distinfo
+++ b/net-im/telepathy-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (telepathy-logger-0.8.0.tar.bz2) = d476f3c16fa25988ced2c0771de70542091d81b5fdd657317cad5c4b110520a2
-SIZE (telepathy-logger-0.8.0.tar.bz2) = 540564
+SHA256 (telepathy-logger-0.8.1.tar.bz2) = 359528f5fa1539b250fead8d68c7a0eaef11ed4284dfb3761fff2b6dd688da39
+SIZE (telepathy-logger-0.8.1.tar.bz2) = 569680
diff --git a/net-im/telepathy-logger/pkg-plist b/net-im/telepathy-logger/pkg-plist
index 8b03db7a6..c561fc851 100644
--- a/net-im/telepathy-logger/pkg-plist
+++ b/net-im/telepathy-logger/pkg-plist
@@ -31,10 +31,3 @@ share/gtk-doc/html/telepathy-logger/style.css
 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.2/telepathy-logger
-@dirrm include/telepathy-logger-0.2
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 731fee2cb..852a6b7fe 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -3,7 +3,7 @@
 #    $MCom$
 
 PORTNAME=	telepathy-mission-control
-PORTVERSION=	5.16.2
+PORTVERSION=	5.16.3
 CATEGORIES=	net-im devel
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-mission-control/
 
@@ -17,7 +17,7 @@ USES=		gmake libtool pathfix pkgconfig
 USE_GNOME=	libxslt
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--disable-upower
 USE_LDCONFIG=	yes
 GLIB_SCHEMAS=	im.telepathy.MissionControl.FromEmpathy.gschema.xml
diff --git a/net-im/telepathy-mission-control/distinfo b/net-im/telepathy-mission-control/distinfo
index ef3285dd9..bc4b5d60b 100644
--- a/net-im/telepathy-mission-control/distinfo
+++ b/net-im/telepathy-mission-control/distinfo
@@ -1,2 +1,2 @@
-SHA256 (telepathy-mission-control-5.16.2.tar.gz) = 3dcbf8d26cd19e77ef9296c9ae501f8af6cd59aeb058f0a3d5eb75e5647268ea
-SIZE (telepathy-mission-control-5.16.2.tar.gz) = 1095760
+SHA256 (telepathy-mission-control-5.16.3.tar.gz) = 71575d2ff8aa7337aca355e3d921eba5cd2ff050fabc01e51577343093e98b7d
+SIZE (telepathy-mission-control-5.16.3.tar.gz) = 1096019
diff --git a/net-im/telepathy-mission-control/pkg-plist b/net-im/telepathy-mission-control/pkg-plist
index a04426bf4..0ea328987 100644
--- a/net-im/telepathy-mission-control/pkg-plist
+++ b/net-im/telepathy-mission-control/pkg-plist
@@ -44,7 +44,3 @@ share/doc/telepathy-mission-control/mission-control-plugins/style.css
 share/doc/telepathy-mission-control/mission-control-plugins/up.png
 share/dbus-1/services/org.freedesktop.Telepathy.AccountManager.service
 share/dbus-1/services/org.freedesktop.Telepathy.MissionControl5.service
-@dirrm share/doc/telepathy-mission-control/mission-control-plugins
-@dirrm share/doc/telepathy-mission-control
-@dirrm include/mission-control-5.5/mission-control-plugins
-@dirrm include/mission-control-5.5
diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile
index d3e832e34..5eded564d 100644
--- a/net-im/telepathy-qt4/Makefile
+++ b/net-im/telepathy-qt4/Makefile
@@ -3,8 +3,7 @@
 #    $MCom$
 
 PORTNAME=	telepathy-qt4
-PORTVERSION=	0.9.3
-PORTREVISION=	2
+PORTVERSION=	0.9.4
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME:C/4//}/
 DISTNAME=	${PORTNAME:C/4//}-${PORTVERSION}
@@ -27,6 +26,7 @@ USES=		cmake pkgconfig python:build
 CMAKE_ARGS=	-DENABLE_FARSIGHT:BOOL=False \
 		-DENABLE_FARSTREAM:BOOL=True \
 		-DENABLE_TESTS:BOOL=False
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
@@ -53,8 +53,6 @@ pre-configure:
 		${WRKSRC}/TelepathyQt/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|LIB_INSTALL_DIR}/pkgconfig|LIB_INSTALL_DIR}/../libdata/pkgconfig|' \
 		${WRKSRC}/TelepathyQt/Farstream/CMakeLists.txt
-	${REINPLACE_CMD} -e '/$${LIBXML2_INCLUDE_DIR}/ s|$$| ${LOCALBASE}/include|' \
-		${WRKSRC}/TelepathyQt/Farsight/CMakeLists.txt
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|farstream-0.1|farstream-0.2|g' \
diff --git a/net-im/telepathy-qt4/distinfo b/net-im/telepathy-qt4/distinfo
index 320ef4d0d..25e52d809 100644
--- a/net-im/telepathy-qt4/distinfo
+++ b/net-im/telepathy-qt4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (telepathy-qt-0.9.3.tar.gz) = c0ff57bea79b86ad343e184c16941d05f6d6d7dfd03876b44502f11935f44bf9
-SIZE (telepathy-qt-0.9.3.tar.gz) = 4414599
+SHA256 (telepathy-qt-0.9.4.tar.gz) = f1b1db3a9f96ece92df430a8de4d30317f4c58a06fe99e82cc2c6875791e61f2
+SIZE (telepathy-qt-0.9.4.tar.gz) = 5294554
diff --git a/net-im/telepathy-qt4/files/patch-cmake_modules_FindQt.cmake b/net-im/telepathy-qt4/files/patch-cmake_modules_FindQt.cmake
deleted file mode 100644
index f1ff0dedb..000000000
--- a/net-im/telepathy-qt4/files/patch-cmake_modules_FindQt.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- cmake/modules/FindQt.cmake.orig	2013-11-09 10:25:04.481793123 +0000
-+++ cmake/modules/FindQt.cmake	2013-11-09 10:25:11.662793204 +0000
-@@ -74,7 +74,11 @@
- 
- MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
-   IF(QT_VERSION_MAJOR MATCHES 4)
--    QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+    IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
-+    ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+    ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-   ELSE(QT_VERSION_MAJOR MATCHES 4)
-     IF(QT_VERSION_MAJOR MATCHES 5)
-       QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
diff --git a/net-im/telepathy-qt4/pkg-plist b/net-im/telepathy-qt4/pkg-plist
index ce3720c58..20fa5f910 100644
--- a/net-im/telepathy-qt4/pkg-plist
+++ b/net-im/telepathy-qt4/pkg-plist
@@ -63,10 +63,13 @@ include/telepathy-qt4/TelepathyQt/ChannelInterfaceHoldInterface
 include/telepathy-qt4/TelepathyQt/ChannelInterfaceMediaSignallingInterface
 include/telepathy-qt4/TelepathyQt/ChannelInterfaceMessagesInterface
 include/telepathy-qt4/TelepathyQt/ChannelInterfacePasswordInterface
+include/telepathy-qt4/TelepathyQt/ChannelInterfaceRoomConfigInterface
+include/telepathy-qt4/TelepathyQt/ChannelInterfaceRoomInterface
 include/telepathy-qt4/TelepathyQt/ChannelInterfaceSASLAuthenticationInterface
 include/telepathy-qt4/TelepathyQt/ChannelInterfaceSMSInterface
 include/telepathy-qt4/TelepathyQt/ChannelInterfaceSecurableInterface
 include/telepathy-qt4/TelepathyQt/ChannelInterfaceServicePointInterface
+include/telepathy-qt4/TelepathyQt/ChannelInterfaceSubjectInterface
 include/telepathy-qt4/TelepathyQt/ChannelInterfaceTubeInterface
 include/telepathy-qt4/TelepathyQt/ChannelRequest
 include/telepathy-qt4/TelepathyQt/ChannelRequestHints