3 files changed, 61 insertions, 55 deletions

diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index eac59c5e0ab9..dc19d83815ef 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 $
 
 PORTNAME=	telepathy-glib
-PORTVERSION=	0.5.13
+PORTVERSION=	0.7.5
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
@@ -21,16 +21,14 @@ BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack pkgconfig glib20 ltverhack
 USE_PYTHON_BUILD=	yes
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
+		${WRKSRC}/telepathy-glib/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/net-im/telepathy-glib/distinfo b/net-im/telepathy-glib/distinfo
index dc86c3b9778f..97d6f2024917 100644
--- a/net-im/telepathy-glib/distinfo
+++ b/net-im/telepathy-glib/distinfo
@@ -1,3 +1,3 @@
-MD5 (telepathy-glib-0.5.13.tar.gz) = 61b16101b6164ae495c765c2d09a0899
-SHA256 (telepathy-glib-0.5.13.tar.gz) = b65afe985035b2fe88aeda82bb012fb9c40babbcd78b0043c03e32a943625014
-SIZE (telepathy-glib-0.5.13.tar.gz) = 821214
+MD5 (telepathy-glib-0.7.5.tar.gz) = 3a945bf8584d8435ae59e05de689f966
+SHA256 (telepathy-glib-0.7.5.tar.gz) = e0d72fc168f7af3f82cdc2ddfed07b2b2b6e3fe41ad0db74e734ac22f63700e5
+SIZE (telepathy-glib-0.7.5.tar.gz) = 1338987
diff --git a/net-im/telepathy-glib/pkg-plist b/net-im/telepathy-glib/pkg-plist
index 375dd9492271..8722b9f43ce0 100644
--- a/net-im/telepathy-glib/pkg-plist
+++ b/net-im/telepathy-glib/pkg-plist
@@ -1,35 +1,36 @@
-include/telepathy-1.0/telepathy-glib/_gen/svc-Channel.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Channel_Interface_Chat_State.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Channel_Interface_DTMF.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Channel_Interface_Group.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Channel_Interface_Media_Signalling.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Channel_Interface_Password.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Channel_Type_Contact_List.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Channel_Type_Room_List.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Channel_Type_Streamed_Media.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Channel_Type_Text.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Connection.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Connection_Interface_Aliasing.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Connection_Interface_Avatars.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Connection_Interface_Capabilities.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Connection_Interface_Presence.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Connection_Manager.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Media_Session_Handler.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Media_Stream_Handler.h
-include/telepathy-1.0/telepathy-glib/_gen/svc-Properties_Interface.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-errors.h
 include/telepathy-1.0/telepathy-glib/_gen/telepathy-interfaces.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel.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-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-svc-channel.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-svc-connection-manager.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-svc-connection.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/base-connection-manager.h
 include/telepathy-1.0/telepathy-glib/base-connection.h
 include/telepathy-1.0/telepathy-glib/channel-factory-iface.h
 include/telepathy-1.0/telepathy-glib/channel-iface.h
+include/telepathy-1.0/telepathy-glib/channel.h
+include/telepathy-1.0/telepathy-glib/connection-manager.h
+include/telepathy-1.0/telepathy-glib/connection.h
+include/telepathy-1.0/telepathy-glib/dbus-properties-mixin.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.h
+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/group-mixin.h
+include/telepathy-1.0/telepathy-glib/gtypes.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
@@ -37,44 +38,36 @@ include/telepathy-1.0/telepathy-glib/handle.h
 include/telepathy-1.0/telepathy-glib/heap.h
 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/presence-mixin.h
 include/telepathy-1.0/telepathy-glib/properties-mixin.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/svc-channel.h
 include/telepathy-1.0/telepathy-glib/svc-connection-manager.h
 include/telepathy-1.0/telepathy-glib/svc-connection.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/text-mixin.h
 include/telepathy-1.0/telepathy-glib/util.h
-include/telepathy-unstable/telepathy-glib/_gen/svc-Channel_Interface_Hold.h
-include/telepathy-unstable/telepathy-glib/_gen/svc-Channel_Interface_Transfer.h
-include/telepathy-unstable/telepathy-glib/_gen/svc-Channel_Type_Contact_Search.h
-include/telepathy-unstable/telepathy-glib/_gen/svc-Channel_Type_Tubes.h
-include/telepathy-unstable/telepathy-glib/_gen/svc-Connection_Interface_Contact_Info.h
-include/telepathy-unstable/telepathy-glib/_gen/svc-Connection_Interface_Forwarding.h
-include/telepathy-unstable/telepathy-glib/_gen/svc-Connection_Interface_Privacy.h
-include/telepathy-unstable/telepathy-glib/_gen/svc-Connection_Interface_Renaming.h
-include/telepathy-unstable/telepathy-glib/_gen/unstable-enums.h
-include/telepathy-unstable/telepathy-glib/_gen/unstable-interfaces.h
-include/telepathy-unstable/telepathy-glib/_gen/unstable-svc.h
-include/telepathy-unstable/telepathy-glib/svc-unstable.h
-lib/libtelepathy-glib-unstable.a
-lib/libtelepathy-glib-unstable.la
 lib/libtelepathy-glib.a
 lib/libtelepathy-glib.la
 lib/libtelepathy-glib.so
-lib/libtelepathy-glib.so.2
-libdata/pkgconfig/telepathy-glib-unstable.pc
+lib/libtelepathy-glib.so.0
 libdata/pkgconfig/telepathy-glib.pc
 share/gtk-doc/html/telepathy-glib/TpBaseConnection.html
 share/gtk-doc/html/telepathy-glib/TpBaseConnectionManager.html
+share/gtk-doc/html/telepathy-glib/TpChannelIface.html
 share/gtk-doc/html/telepathy-glib/TpDynamicHandleRepo.html
 share/gtk-doc/html/telepathy-glib/TpStaticHandleRepo.html
-share/gtk-doc/html/telepathy-glib/base-classes.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-handle-management.html
-share/gtk-doc/html/telepathy-glib/ch-mixins.html
+share/gtk-doc/html/telepathy-glib/ch-protocol.html
+share/gtk-doc/html/telepathy-glib/ch-service-base.html
+share/gtk-doc/html/telepathy-glib/ch-service-dbus.html
+share/gtk-doc/html/telepathy-glib/ch-service-handles.html
 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
@@ -83,39 +76,54 @@ share/gtk-doc/html/telepathy-glib/left.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-TpChannelFactoryIface.html
-share/gtk-doc/html/telepathy-glib/telepathy-glib-TpChannelIface.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-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-channel-group.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-media.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-roomlist.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-text.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-connection-aliasing.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-avatars.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-caps.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.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-dbus-properties-mixin.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-dbus.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-debug-ansi.html
 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-gtypes.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-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-svc-channel.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-connection-manager.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-connection.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-properties-interface.html
-share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-unstable.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
-@dirrm share/gtk-doc/html/telepathy-glib
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc
-@dirrm include/telepathy-unstable/telepathy-glib/_gen
-@dirrm include/telepathy-unstable/telepathy-glib
-@dirrmtry include/telepathy-unstable
+@dirrm share/gtk-doc/html/telepathy-glib
 @dirrm include/telepathy-1.0/telepathy-glib/_gen
 @dirrm include/telepathy-1.0/telepathy-glib
 @dirrmtry include/telepathy-1.0