Various updates to the telepathy stack:

	- Make the touched telepathy ports stage compliant
	- Fix $MCom$ tag in some of them
	- Upgrade -gabble to 0.17.3, -idle to 0.1.14, -logger to 0.8.0, -mission-control to 5.14.0
	- Because of the lib bump in -logger, increase PORTREVISION to it and dependant ports in MC (gnome-shell and empathy3)
	- While here do some lib_depends fixing to gnome-shell to the new format
	- Do some USE_GNOME sorting and add pkgconfig to USES
	- Fix -gabble's lib_depend
	- Fix -mission-control post-patch so it installs the gtk-doc in the right place honouring $PREFIX

Reviewed by:	kwm


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

15 files changed, 77 insertions, 72 deletions

diff --git a/net-im/empathy3/Makefile b/net-im/empathy3/Makefile
index 6147f48dc..efe43b39a 100644
--- a/net-im/empathy3/Makefile
+++ b/net-im/empathy3/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	empathy
 PORTVERSION=	3.6.2
+PORTREVISION=	1
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
 
diff --git a/net-im/telepathy-farstream/Makefile b/net-im/telepathy-farstream/Makefile
index 4addd49a7..8fa7b8fa8 100644
--- a/net-im/telepathy-farstream/Makefile
+++ b/net-im/telepathy-farstream/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom
+#    $MCom$
 
 PORTNAME=	telepathy-farstream
 PORTVERSION=	0.6.0
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index 84c64b86c..0080f3d5c 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -1,8 +1,9 @@
+# Created by:  Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/trunk/net-im/telepathy-gabble/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#    $MCom$
 
 PORTNAME=	telepathy-gabble
-PORTVERSION=	0.16.6
+PORTVERSION=	0.17.3
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
@@ -17,22 +18,21 @@ LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
+		libnice-gst1>=0:${PORTSDIR}/net-im/libnice-gst1
 
 PORTSCOUT=	limitw:1,even
 
-NO_STAGE=	yes
 GNU_CONFIGURE=	yes
 USES=		gmake pathfix pkgconfig
 USE_GNOME=	glib20 libxslt:build
 USE_SQLITE=	yes
 USE_OPENSSL=	yes
 USE_PYTHON_BUILD=	yes
+MAKE_JOBS_UNSAFE=	yes
 CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
 CONFIGURE_ENV=	LIBS="-pthread"
 
-MAN8=		telepathy-gabble.8
-
 PLIST_SUB=	PVERSION=${PORTVERSION}
 
 .if defined(WITH_OPENSSL_BASE)
diff --git a/net-im/telepathy-gabble/distinfo b/net-im/telepathy-gabble/distinfo
index 1b77e5bbc..16eca14a1 100644
--- a/net-im/telepathy-gabble/distinfo
+++ b/net-im/telepathy-gabble/distinfo
@@ -1,2 +1,2 @@
-SHA256 (telepathy-gabble-0.16.6.tar.gz) = 0a4726241f3e0ef6a42281eca954ff63948c44d2faa264242faa3a92fb02b792
-SIZE (telepathy-gabble-0.16.6.tar.gz) = 2434346
+SHA256 (telepathy-gabble-0.17.3.tar.gz) = b75f28d3645f2bd8046ad1a4754e3bc164fd44f62cf3b1cbe34c71d4542b94c9
+SIZE (telepathy-gabble-0.17.3.tar.gz) = 2710882
diff --git a/net-im/telepathy-gabble/pkg-plist b/net-im/telepathy-gabble/pkg-plist
index 62bf393ca..112df99da 100644
--- a/net-im/telepathy-gabble/pkg-plist
+++ b/net-im/telepathy-gabble/pkg-plist
@@ -12,6 +12,7 @@ lib/telepathy/gabble-0/plugins/libconsole.so
 lib/telepathy/gabble-0/plugins/libgateways.la
 lib/telepathy/gabble-0/plugins/libgateways.so
 libexec/telepathy-gabble
+man/man8/telepathy-gabble.8.gz
 share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.gabble.service
 %%DOCSDIR%%/muc-bytestream.html
 %%DOCSDIR%%/olpc.html
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index 38bc877a4..277268435 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -1,9 +1,9 @@
 # Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/trunk/net-im/telepathy-idle/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#    $MCom$
 
 PORTNAME=	telepathy-idle
-PORTVERSION=	0.1.11
+PORTVERSION=	0.1.14
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
@@ -14,14 +14,11 @@ LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
 
-NO_STAGE=	yes
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 USES=		gmake pathfix pkgconfig
 USE_GNOME=	glib20 libxslt:build
 
-MAN8=		telepathy-idle.8
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/net-im/telepathy-idle/distinfo b/net-im/telepathy-idle/distinfo
index effb00700..9f1fbc011 100644
--- a/net-im/telepathy-idle/distinfo
+++ b/net-im/telepathy-idle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (telepathy-idle-0.1.11.tar.gz) = 047ccbec0b91ac187467ede5a90966f9ec881df56fd8c80cb3bce3710f66fda0
-SIZE (telepathy-idle-0.1.11.tar.gz) = 505354
+SHA256 (telepathy-idle-0.1.14.tar.gz) = df344e7959d99ab4ee4c0bcde82e6fc652cc48dc93ce11fcd024fa2383068fec
+SIZE (telepathy-idle-0.1.14.tar.gz) = 539200
diff --git a/net-im/telepathy-idle/pkg-plist b/net-im/telepathy-idle/pkg-plist
index 2c0dc70d3..ce5e6fb50 100644
--- a/net-im/telepathy-idle/pkg-plist
+++ b/net-im/telepathy-idle/pkg-plist
@@ -1,4 +1,5 @@
 libexec/telepathy-idle
+man/man8/telepathy-idle.8.gz
 share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.idle.service
 share/telepathy/managers/idle.manager
 @dirrmtry share/telepathy/managers
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index 00d8b1b25..e20f9387e 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -1,9 +1,10 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/trunk/net-im/telepathy-logger/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#    $MCom$
 
 PORTNAME=	telepathy-logger
-PORTVERSION=	0.4.0
+PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
@@ -14,14 +15,14 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
 
 LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-NO_STAGE=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USES=		gmake pathfix pkgconfig
-USE_GNOME=	glib20 intltool gnomedocutils ltverhack libxml2 libxslt:build \
-		introspection:build
+USE_GNOME=	glib20 gnomedocutils intltool introspection:build \
+		ltverhack libxml2 libxslt:build
 USE_SQLITE=	yes
 USE_PYTHON_BUILD=	yes
 GLIB_SCHEMAS=	org.freedesktop.Telepathy.Logger.gschema.xml
diff --git a/net-im/telepathy-logger/distinfo b/net-im/telepathy-logger/distinfo
index 35dcf03c5..2dd60e49c 100644
--- a/net-im/telepathy-logger/distinfo
+++ b/net-im/telepathy-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (telepathy-logger-0.4.0.tar.bz2) = 06b5ab0616afd7572a1bbda58e6a9487bb305f69358c85985a8999f26f4465e5
-SIZE (telepathy-logger-0.4.0.tar.bz2) = 523642
+SHA256 (telepathy-logger-0.8.0.tar.bz2) = d476f3c16fa25988ced2c0771de70542091d81b5fdd657317cad5c4b110520a2
+SIZE (telepathy-logger-0.8.0.tar.bz2) = 540564
diff --git a/net-im/telepathy-logger/pkg-plist b/net-im/telepathy-logger/pkg-plist
index 874268543..058cc56c6 100644
--- a/net-im/telepathy-logger/pkg-plist
+++ b/net-im/telepathy-logger/pkg-plist
@@ -2,21 +2,24 @@ include/telepathy-logger-0.2/telepathy-logger/call-event.h
 include/telepathy-logger-0.2/telepathy-logger/entity.h
 include/telepathy-logger-0.2/telepathy-logger/event.h
 include/telepathy-logger-0.2/telepathy-logger/log-manager.h
+include/telepathy-logger-0.2/telepathy-logger/log-walker.h
 include/telepathy-logger-0.2/telepathy-logger/telepathy-logger.h
 include/telepathy-logger-0.2/telepathy-logger/text-event.h
 lib/girepository-1.0/TelepathyLogger-0.2.typelib
 lib/libtelepathy-logger.a
 lib/libtelepathy-logger.la
 lib/libtelepathy-logger.so
-lib/libtelepathy-logger.so.2
+lib/libtelepathy-logger.so.3
 libdata/pkgconfig/telepathy-logger-0.2.pc
 libexec/telepathy-logger
 share/dbus-1/services/org.freedesktop.Telepathy.Client.Logger.service
 share/dbus-1/services/org.freedesktop.Telepathy.Logger.service
 share/gir-1.0/TelepathyLogger-0.2.gir
+share/gtk-doc/html/telepathy-logger/TplCallEvent.html
 share/gtk-doc/html/telepathy-logger/TplEntity.html
 share/gtk-doc/html/telepathy-logger/TplEvent.html
 share/gtk-doc/html/telepathy-logger/TplLogManager.html
+share/gtk-doc/html/telepathy-logger/TplLogWalker.html
 share/gtk-doc/html/telepathy-logger/TplTextEvent.html
 share/gtk-doc/html/telepathy-logger/ch-public.html
 share/gtk-doc/html/telepathy-logger/home.png
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 0031ec0f9..b42db5142 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -1,9 +1,9 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/trunk/net-im/telepathy-mission-control/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#    $MCom$
 
 PORTNAME=	telepathy-mission-control
-PORTVERSION=	5.12.0
+PORTVERSION=	5.14.0
 CATEGORIES=	net-im devel
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-mission-control/
 
@@ -13,22 +13,18 @@ COMMENT=	Telepathy component to apps to abstract details of connection managers
 LIB_DEPENDS=	libtelepathy.so:${PORTSDIR}/net-im/libtelepathy \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-NO_STAGE=	yes
 USES=		gmake pathfix pkgconfig
-USE_GNOME=	gnomeprefix gconf2 libxslt ltverhack
+USE_GNOME=	gconf2 gnomehack libxslt ltverhack
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 GLIB_SCHEMAS=	im.telepathy.MissionControl.FromEmpathy.gschema.xml
 
-MAN1=		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}|' \
+	@${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR}|' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net-im/telepathy-mission-control/distinfo b/net-im/telepathy-mission-control/distinfo
index 17624836d..f1c5401df 100644
--- a/net-im/telepathy-mission-control/distinfo
+++ b/net-im/telepathy-mission-control/distinfo
@@ -1,2 +1,2 @@
-SHA256 (telepathy-mission-control-5.12.0.tar.gz) = 660aeb65543e1b029dfde6a895934cb20b766644bae2a68c0030052aa6645e77
-SIZE (telepathy-mission-control-5.12.0.tar.gz) = 1014502
+SHA256 (telepathy-mission-control-5.14.0.tar.gz) = 58e0047f5292836c2c35e1603a908b3ac20a5c0b183869514c63de339fd48a30
+SIZE (telepathy-mission-control-5.14.0.tar.gz) = 1026233
diff --git a/net-im/telepathy-mission-control/pkg-plist b/net-im/telepathy-mission-control/pkg-plist
index cef8b825d..5b630c416 100644
--- a/net-im/telepathy-mission-control/pkg-plist
+++ b/net-im/telepathy-mission-control/pkg-plist
@@ -17,30 +17,34 @@ lib/libmission-control-plugins.so
 lib/libmission-control-plugins.so.0
 libdata/pkgconfig/mission-control-plugins.pc
 libexec/mission-control-5
+man/man1/mc-tool.1.gz
+man/man1/mc-wait-for-name.1.gz
+man/man8/mission-control-5.8.gz
+share/doc/telepathy-mission-control/mission-control-plugins/McpAccountManager.html
+share/doc/telepathy-mission-control/mission-control-plugins/McpDispatchOperation.html
+share/doc/telepathy-mission-control/mission-control-plugins/McpRequest.html
+share/doc/telepathy-mission-control/mission-control-plugins/annotation-glossary.html
+share/doc/telepathy-mission-control/mission-control-plugins/api-index-full.html
+share/doc/telepathy-mission-control/mission-control-plugins/ch01.html
+share/doc/telepathy-mission-control/mission-control-plugins/ch02.html
+share/doc/telepathy-mission-control/mission-control-plugins/ch03.html
+share/doc/telepathy-mission-control/mission-control-plugins/ch04.html
+share/doc/telepathy-mission-control/mission-control-plugins/home.png
+share/doc/telepathy-mission-control/mission-control-plugins/index.html
+share/doc/telepathy-mission-control/mission-control-plugins/index.sgml
+share/doc/telepathy-mission-control/mission-control-plugins/left.png
+share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins-McpAccountStorage.html
+share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins-McpDispatchOperationPolicy.html
+share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins-McpRequestPolicy.html
+share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins-Plugin-loader-and-global-functions.html
+share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins.devhelp2
+share/doc/telepathy-mission-control/mission-control-plugins/object-tree.html
+share/doc/telepathy-mission-control/mission-control-plugins/right.png
+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
-share/doc/mission-control-plugins/McpAccountManager.html
-share/doc/mission-control-plugins/McpDispatchOperation.html
-share/doc/mission-control-plugins/McpRequest.html
-share/doc/mission-control-plugins/annotation-glossary.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-McpAccountStorage.html
-share/doc/mission-control-plugins/mission-control-plugins-McpDispatchOperationPolicy.html
-share/doc/mission-control-plugins/mission-control-plugins-McpRequestPolicy.html
-share/doc/mission-control-plugins/mission-control-plugins-Plugin-loader-and-global-functions.html
-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 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/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 926b8fe02..bf3fd95d7 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	gnome-shell
 PORTVERSION=	3.6.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,20 +13,20 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Next generation GNOME desktop shell
 
 BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification \
-		caribou:${PORTSDIR}/accessibility/caribou \
-		mutter:${PORTSDIR}/x11-wm/mutter \
-		gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
-		gcr-3:${PORTSDIR}/security/gcr \
-		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
-		telepathy-logger:${PORTSDIR}/net-im/telepathy-logger \
-		folks:${PORTSDIR}/net-im/folks \
-		ibus:${PORTSDIR}/textproc/ibus \
-		pulse:${PORTSDIR}/audio/pulseaudio \
-		croco-0.6:${PORTSDIR}/textproc/libcroco \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		clutter-1.0:${PORTSDIR}/graphics/clutter \
-		gjs:${PORTSDIR}/lang/gjs
+LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
+		libcaribou.so:${PORTSDIR}/accessibility/caribou \
+		libmutter.so:${PORTSDIR}/x11-wm/mutter \
+		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
+		libgcr-3.so:${PORTSDIR}/security/gcr \
+		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
+		libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \
+		libfolks.so:${PORTSDIR}/net-im/folks \
+		libibus.so:${PORTSDIR}/textproc/ibus \
+		libpulse.so:${PORTSDIR}/audio/pulseaudio \
+		libcroco-0.6.so:${PORTSDIR}/textproc/libcroco \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libclutter-1.0.so:${PORTSDIR}/graphics/clutter \
+		libgjs.so:${PORTSDIR}/lang/gjs
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
 		gdm>=3.6.0:${PORTSDIR}/x11/gdm3 \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
@@ -33,7 +34,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-
 NO_STAGE=	yes
 USE_XZ=		yes
 USE_XORG=	x11 xfixes sm
-USES=		gettext gmake pathfix
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	evolutiondataserver3 gnomedesktop3 gnomemenus3 gnomeprefix \
 		gtk30 intlhack introspection ltverhack