3 files changed, 32 insertions, 15 deletions

diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index 436527408e2a..0d8b87999cc4 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -1,32 +1,27 @@
 # $FreeBSD$
-#    $MCom: ports/net-im/telepathy-glib/Makefile,v 1.38 2012/08/07 20:30:33 kwm Exp $
+#    $MCom: ports/trunk/net-im/telepathy-glib/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	telepathy-glib
-PORTVERSION=	0.18.2
+PORTVERSION=	0.20.2
 CATEGORIES=	net-im
-MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/ \
-		http://miwibox.org/distfiles/
+MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib utility library for the Telepathy framework
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		vala-vapigen>=0.14.0:${PORTSDIR}/lang/vala-vapigen \
-		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+BUILD_DEPENDS=	vala-vapigen>=0.20.0:${PORTSDIR}/lang/vala-vapigen
 LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	vapigen:${PORTSDIR}/lang/vala-vapigen
 
+PORTSCOUT=	limitw:1,even
+
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack glib20 ltverhack gnomehier
+USES=		gmake pathfix pkgconfig
+USE_GNOME=	glib20 gnomehier introspection:build libxslt:build ltverhack
 USE_PYTHON_BUILD=	yes
 MAKE_JOBS_UNSAFE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-vala-bindings
 
-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-glib/distinfo b/net-im/telepathy-glib/distinfo
index 83cbaecd20bb..df425cbb5895 100644
--- a/net-im/telepathy-glib/distinfo
+++ b/net-im/telepathy-glib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (telepathy-glib-0.18.2.tar.gz) = 372375578be8053398f9fb1e12188a8b472d6d897e0ac73b230d31e112c68b3f
-SIZE (telepathy-glib-0.18.2.tar.gz) = 3539165
+SHA256 (telepathy-glib-0.20.2.tar.gz) = 43c7d576576d9c5856bc56a45a86f42d770b427371e10698c9ed3f9ced65c7ed
+SIZE (telepathy-glib-0.20.2.tar.gz) = 3776255
diff --git a/net-im/telepathy-glib/pkg-plist b/net-im/telepathy-glib/pkg-plist
index afaaa0ac1b4a..49bcde053010 100644
--- a/net-im/telepathy-glib/pkg-plist
+++ b/net-im/telepathy-glib/pkg-plist
@@ -16,11 +16,13 @@ include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel.h
 include/telepathy-1.0/telepathy-glib/_gen/tp-cli-client.h
 include/telepathy-1.0/telepathy-glib/_gen/tp-cli-connection-manager.h
 include/telepathy-1.0/telepathy-glib/_gen/tp-cli-connection.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-cli-debug.h
 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-cli-tls-cert.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-call-content-media-description.h
@@ -42,6 +44,7 @@ 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-request.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/automatic-client-factory.h
@@ -92,6 +95,8 @@ include/telepathy-1.0/telepathy-glib/dbus-properties-mixin.h
 include/telepathy-1.0/telepathy-glib/dbus-tube-channel.h
 include/telepathy-1.0/telepathy-glib/dbus.h
 include/telepathy-1.0/telepathy-glib/debug-ansi.h
+include/telepathy-1.0/telepathy-glib/debug-client.h
+include/telepathy-1.0/telepathy-glib/debug-message.h
 include/telepathy-1.0/telepathy-glib/debug-sender.h
 include/telepathy-1.0/telepathy-glib/debug.h
 include/telepathy-1.0/telepathy-glib/defs.h
@@ -145,11 +150,18 @@ 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/room-info.h
+include/telepathy-1.0/telepathy-glib/room-list.h
+include/telepathy-1.0/telepathy-glib/telepathy-glib-dbus.h
 include/telepathy-1.0/telepathy-glib/telepathy-glib.h
 include/telepathy-1.0/telepathy-glib/text-channel.h
 include/telepathy-1.0/telepathy-glib/text-mixin.h
+include/telepathy-1.0/telepathy-glib/tls-certificate-rejection.h
+include/telepathy-1.0/telepathy-glib/tls-certificate.h
 include/telepathy-1.0/telepathy-glib/util.h
+include/telepathy-1.0/telepathy-glib/variant-util.h
 include/telepathy-1.0/telepathy-glib/verify.h
+include/telepathy-1.0/telepathy-glib/version.h
 lib/girepository-1.0/TelepathyGLib-0.12.typelib
 lib/libtelepathy-glib.a
 lib/libtelepathy-glib.la
@@ -174,12 +186,16 @@ share/gtk-doc/html/telepathy-glib/TpChannelFactoryIface.html
 share/gtk-doc/html/telepathy-glib/TpChannelIface.html
 share/gtk-doc/html/telepathy-glib/TpChannelManager.html
 share/gtk-doc/html/telepathy-glib/TpClientMessage.html
+share/gtk-doc/html/telepathy-glib/TpDebugClient.html
+share/gtk-doc/html/telepathy-glib/TpDebugMessage.html
 share/gtk-doc/html/telepathy-glib/TpDynamicHandleRepo.html
 share/gtk-doc/html/telepathy-glib/TpExportableChannel.html
 share/gtk-doc/html/telepathy-glib/TpIntset.html
 share/gtk-doc/html/telepathy-glib/TpMessage.html
 share/gtk-doc/html/telepathy-glib/TpSignalledMessage.html
 share/gtk-doc/html/telepathy-glib/TpStaticHandleRepo.html
+share/gtk-doc/html/telepathy-glib/TpTLSCertificate.html
+share/gtk-doc/html/telepathy-glib/TpTLSCertificateRejection.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
@@ -204,6 +220,7 @@ 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-account-manager.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-account-request.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-account.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-add-dispatch-operation-context.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-asv.html
@@ -325,8 +342,13 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-protocol.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.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-room-info.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-room-list.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-text-channel.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-util.html
+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.png
 share/vala/vapi/telepathy-glib.deps