Update to 3.6.2.

Submitted by:	Gustau Perez


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

3 files changed, 68 insertions, 14 deletions

diff --git a/net-im/empathy3/Makefile b/net-im/empathy3/Makefile
index e76c4e4b1..68b4a2c6d 100644
--- a/net-im/empathy3/Makefile
+++ b/net-im/empathy3/Makefile
@@ -1,10 +1,9 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/trunk/net-im/empathy3/Makefile 17268 2013-04-01 05:13:11Z marcus $
+#    $MCom: ports/net-im/empathy3/Makefile,v 1.32 2012/07/02 14:47:52 kwm Exp $
 
 PORTNAME=	empathy
-PORTVERSION=	3.4.2.1
-PORTREVISION=	1
+PORTVERSION=	3.6.2
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
 
@@ -17,6 +16,8 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
 		itstool:${PORTSDIR}/textproc/itstool \
     		${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
 LIB_DEPENDS=	enchant:${PORTSDIR}/textproc/enchant \
+		geocode-glib:${PORTSDIR}/net/geocode-glib \
+		goa-1.0:${PORTSDIR}/net/gnome-online-accounts \
 		pulse:${PORTSDIR}/audio/pulseaudio \
 		telepathy:${PORTSDIR}/net-im/libtelepathy \
 		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
@@ -26,7 +27,7 @@ LIB_DEPENDS=	enchant:${PORTSDIR}/textproc/enchant \
 		notify:${PORTSDIR}/devel/libnotify \
 		gcr-3:${PORTSDIR}/security/gcr \
 		canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
-		clutter-gst-1.0:${PORTSDIR}/multimedia/clutter-gst \
+		clutter-gst-2.0:${PORTSDIR}/multimedia/clutter-gst \
 		webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 \
 		soup-2.4:${PORTSDIR}/devel/libsoup
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
@@ -42,7 +43,7 @@ USE_XZ=		yes
 USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	evolutiondataserver3 gnomeprefix ltverhack
-USE_GSTREAMER=	yes
+USE_GSTREAMER1=	yes
 USE_AUTOTOOLS=	libtool
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
@@ -50,7 +51,8 @@ USE_PYTHON=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-Werror \
-		--disable-goa \
+		--enable-goa \
+		--enable-gst-1.0=yes \
 		--enable-location=no
 
 GLIB_SCHEMAS=	org.gnome.Empathy.gschema.xml
@@ -104,7 +106,7 @@ PLIST_SUB+=	NST="@comment "
 
 .if ${PORT_OPTIONS:MMAP}
 USE_GL=		gl
-LIB_DEPENDS+=	champlain-0.12.0:${PORTSDIR}/graphics/libchamplain
+LIB_DEPENDS+=	champlain-0.12:${PORTSDIR}/graphics/libchamplain
 CONFIGURE_ARGS+=--enable-map
 PLIST_SUB+=	MAP=""
 .else
@@ -113,10 +115,15 @@ PLIST_SUB+=	MAP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCHEESE}
-LIB_DEPENDS+=	cheese-gtk:${PORTSDIR}/multimedia/cheese3
+BUILD_DEPENDS+=	cheese>=3.0.0:${PORTSDIR}/multimedia/cheese3
+RUN_DEPENDS+=	cheese>=3.0.0:${PORTSDIR}/multimedia/cheese3
 CONFIGURE_ARGS+=--with-cheese
 .else
 CONFIGURE_ARGS+=--without-cheese
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|clutter-gst-1.0|clutter-gst-2.0|g' \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/net-im/empathy3/distinfo b/net-im/empathy3/distinfo
index a7a80c7fb..b03be8e4a 100644
--- a/net-im/empathy3/distinfo
+++ b/net-im/empathy3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (empathy-3.4.2.1.tar.xz) = e73a30259492860d5c93213b33f8850b8a45053222062fd6e2784ba447d9cce0
-SIZE (empathy-3.4.2.1.tar.xz) = 3433484
+SHA256 (empathy-3.6.2.tar.xz) = 707bf283f37e8b91816c78742d9ebf9e3effc4206a3ecc3e4c0cfbbf8ce0fd26
+SIZE (empathy-3.6.2.tar.xz) = 3443720
diff --git a/net-im/empathy3/pkg-plist b/net-im/empathy3/pkg-plist
index 8fe43cdff..857cc872c 100644
--- a/net-im/empathy3/pkg-plist
+++ b/net-im/empathy3/pkg-plist
@@ -4,17 +4,49 @@ bin/empathy-debugger
 %%NST%%lib/nautilus-sendto/plugins/libnstempathy.a
 %%NST%%lib/nautilus-sendto/plugins/libnstempathy.la
 %%NST%%lib/nautilus-sendto/plugins/libnstempathy.so
+lib/empathy/libempathy-3.6.2.so
+lib/empathy/libempathy-gtk-3.6.2.so
+lib/empathy/libempathy-gtk.a
+lib/empathy/libempathy-gtk.la
+lib/empathy/libempathy-gtk.so
+lib/empathy/libempathy.a
+lib/empathy/libempathy.la
+lib/empathy/libempathy.so
+lib/mission-control-plugins.0/mcp-account-manager-goa.a
+lib/mission-control-plugins.0/mcp-account-manager-goa.la
+lib/mission-control-plugins.0/mcp-account-manager-goa.so
 libexec/empathy-auth-client
 libexec/empathy-call
 libexec/empathy-chat
 share/GConf/gsettings/empathy.convert
-share/applications/empathy-accounts.desktop
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Info.plist
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Status.html
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Variants/Blue.css
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Variants/Clean.css
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Variants/Simple.css
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/main.css
+share/adium/message-styles/Classic.AdiumMessageStyle/Contents/Info.plist
+share/adium/message-styles/Classic.AdiumMessageStyle/Contents/Resources/Content.html
+share/adium/message-styles/Classic.AdiumMessageStyle/Contents/Resources/Status.html
+share/adium/message-styles/Classic.AdiumMessageStyle/Contents/Resources/main.css
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Info.plist
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Images/corners.png
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Images/horizontal.png
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Images/nipple.png
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Images/vertical.png
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Status.html
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css
 share/applications/empathy.desktop
 share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Auth.service
 share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Call.service
 share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Chat.service
 share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.FileTransfer.service
 %%DATADIR%%/Template.html
+%%DATADIR%%/empathy.css
 %%DATADIR%%/empathy-account-widget-aim.ui
 %%DATADIR%%/empathy-account-widget-generic.ui
 %%DATADIR%%/empathy-account-widget-groupwise.ui
@@ -33,7 +65,6 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.FileTransfer.serv
 %%DATADIR%%/empathy-chatroom-manager.dtd
 %%DATADIR%%/empathy-chatrooms-window.ui
 %%DATADIR%%/empathy-contact-blocking-dialog.ui
-%%DATADIR%%/empathy-contact-dialogs.ui
 %%DATADIR%%/empathy-contact-groups.dtd
 %%DATADIR%%/empathy-contact-widget.ui
 %%DATADIR%%/empathy-ft-manager.ui
@@ -42,7 +73,6 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.FileTransfer.serv
 %%DATADIR%%/empathy-irc-networks.dtd
 %%DATADIR%%/empathy-log-window.html
 %%DATADIR%%/empathy-log-window.ui
-%%DATADIR%%/empathy-map-view.ui
 %%DATADIR%%/empathy-new-chatroom-dialog.ui
 %%DATADIR%%/empathy-preferences.ui
 %%DATADIR%%/empathy-roster-window-menubar.ui
@@ -51,7 +81,6 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.FileTransfer.serv
 %%DATADIR%%/empathy-status-icon.ui
 %%DATADIR%%/empathy-status-preset-dialog.ui
 %%DATADIR%%/empathy-status-presets.dtd
-%%DATADIR%%/empathy-streamed-media-window.ui
 %%DATADIR%%/icons/hicolor/16x16/actions/im-message-new.png
 %%DATADIR%%/icons/hicolor/16x16/apps/im-aim.png
 %%DATADIR%%/icons/hicolor/16x16/apps/im-ekiga.png
@@ -1442,6 +1471,7 @@ 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/km/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
@@ -1624,5 +1654,22 @@ share/telepathy/clients/Empathy.FileTransfer.client
 @dirrm %%DATADIR%%/icons/hicolor/16x16
 @dirrm %%DATADIR%%/icons/hicolor
 @dirrm %%DATADIR%%/icons
+@dirrm share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming
+@dirrm share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Images
+@dirrm share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources
+@dirrm share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents
+@dirrm share/adium/message-styles/PlanetGNOME.AdiumMessageStyle
+@dirrm share/adium/message-styles/Classic.AdiumMessageStyle/Contents/Resources
+@dirrm share/adium/message-styles/Classic.AdiumMessageStyle/Contents
+@dirrm share/adium/message-styles/Classic.AdiumMessageStyle
+@dirrm share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Variants
+@dirrm share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Incoming
+@dirrm share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources
+@dirrm share/adium/message-styles/Boxes.AdiumMessageStyle/Contents
+@dirrm share/adium/message-styles/Boxes.AdiumMessageStyle
+@dirrm share/adium/message-styles
+@dirrm share/adium
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
+@dirrm lib/mission-control-plugins.0
+@dirrm lib/empathy