Update to 3.2.0.1.

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

4 files changed, 72 insertions, 23 deletions

diff --git a/net-im/empathy3/Makefile b/net-im/empathy3/Makefile
index 244d4e1fa..262172c8e 100644
--- a/net-im/empathy3/Makefile
+++ b/net-im/empathy3/Makefile
@@ -3,11 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/empathy3/Makefile,v 1.19 2011/09/19 17:58:08 kwm Exp $
+#    $MCom: ports/net-im/empathy3/Makefile,v 1.20 2011/10/07 10:32:58 kwm Exp $
 
 PORTNAME=	empathy
-PORTVERSION=	3.1.91
-PORTREVISION=	1
+PORTVERSION=	3.2.0.1
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
 
@@ -47,9 +46,10 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_PYTHON=	yes
 MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-Werror \
+		--disable-goa \
 		--enable-location=no
 #		--with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
 
@@ -66,7 +66,7 @@ OPTIONS=	JABBER	"Enable jabber (XMPP) client support" on \
 		MAP	"Enable graphical map support" on
 #		NST	"Enable Nautilus SendTo plugin"	on \
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_JABBER)
 RUN_DEPENDS+=	${LOCALBASE}/libexec/telepathy-gabble:${PORTSDIR}/net-im/telepathy-gabble
@@ -107,7 +107,6 @@ CONFIGURE_ARGS+=--enable-nautilus-sendto=no
 PLIST_SUB+=	NST="@comment "
 #.endif
 
-# needs ported to gtk3
 .if !defined(WITHOUT_MAP)
 LIB_DEPENDS+=	champlain-0.12.0:${PORTSDIR}/graphics/libchamplain
 CONFIGURE_ARGS+=--enable-map
@@ -117,4 +116,4 @@ CONFIGURE_ARGS+=--disable-map
 PLIST_SUB+=	MAP="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/empathy3/distinfo b/net-im/empathy3/distinfo
index 900f5a5c4..cef59e264 100644
--- a/net-im/empathy3/distinfo
+++ b/net-im/empathy3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (empathy-3.1.91.tar.xz) = 5292b00b6c365645ea8f467fb0f86efa4e6b479f10ac4de6f96facb62faac526
-SIZE (empathy-3.1.91.tar.xz) = 3094640
+SHA256 (empathy-3.2.0.1.tar.xz) = b11f6f980ce7ae75ddcdbe14bded86c0cc5970181e2257026610a025b75f5512
+SIZE (empathy-3.2.0.1.tar.xz) = 3191076
diff --git a/net-im/empathy3/files/patch-configure b/net-im/empathy3/files/patch-configure
deleted file mode 100644
index 7afeed78f..000000000
--- a/net-im/empathy3/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	2011-02-24 14:17:23.000000000 +0000
-+++ configure	2011-02-24 14:25:36.000000000 +0000
-@@ -13366,8 +13366,8 @@
- .SECONDARY: $(gsettings_SCHEMAS)
- 
- gsettings__base_list = \
--  sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
--  sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
-+  sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
-+  sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
- 
- install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid)
- 	@$(NORMAL_INSTALL)
diff --git a/net-im/empathy3/pkg-plist b/net-im/empathy3/pkg-plist
index 66629411d..2ffc58ce4 100644
--- a/net-im/empathy3/pkg-plist
+++ b/net-im/empathy3/pkg-plist
@@ -13,6 +13,7 @@ share/applications/empathy.desktop
 share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service
 share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Auth.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%%/codec-preferences
 %%DATADIR%%/element-properties
@@ -42,7 +43,9 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Chat.service
 %%DATADIR%%/empathy-import-dialog.ui
 %%DATADIR%%/empathy-individual-widget.ui
 %%DATADIR%%/empathy-irc-networks.dtd
+%%DATADIR%%/empathy-log-window.html
 %%DATADIR%%/empathy-log-window.ui
+%%DATADIR%%/empathy-main-window-menubar.ui
 %%DATADIR%%/empathy-main-window.ui
 %%MAP%%%%DATADIR%%/empathy-map-view.ui
 %%DATADIR%%/empathy-new-chatroom-dialog.ui
@@ -51,6 +54,7 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Chat.service
 %%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
@@ -610,6 +614,62 @@ share/gnome/help/empathy/es/set-custom-status.page
 share/gnome/help/empathy/es/share-desktop.page
 share/gnome/help/empathy/es/status-icons.page
 share/gnome/help/empathy/es/video-call.page
+share/gnome/help/empathy/eu/account-irc.page
+share/gnome/help/empathy/eu/account-jabber.page
+share/gnome/help/empathy/eu/accounts-window.page
+share/gnome/help/empathy/eu/add-account.page
+share/gnome/help/empathy/eu/add-contact.page
+share/gnome/help/empathy/eu/audio-call.page
+share/gnome/help/empathy/eu/audio-video.page
+share/gnome/help/empathy/eu/change-status.page
+share/gnome/help/empathy/eu/create-account.page
+share/gnome/help/empathy/eu/disable-account.page
+share/gnome/help/empathy/eu/favorite-rooms.page
+share/gnome/help/empathy/eu/figures/audio-input-microphone.png
+share/gnome/help/empathy/eu/figures/available.png
+share/gnome/help/empathy/eu/figures/away.png
+share/gnome/help/empathy/eu/figures/busy.png
+share/gnome/help/empathy/eu/figures/camera-web.png
+share/gnome/help/empathy/eu/figures/empathy-logo.png
+share/gnome/help/empathy/eu/figures/empathy-main-window.png
+share/gnome/help/empathy/eu/figures/gtk-add.png
+share/gnome/help/empathy/eu/figures/gtk-edit.png
+share/gnome/help/empathy/eu/figures/gtk-remove.png
+share/gnome/help/empathy/eu/figures/offline.png
+share/gnome/help/empathy/eu/geolocation-not-showing.page
+share/gnome/help/empathy/eu/geolocation-privacy.page
+share/gnome/help/empathy/eu/geolocation-supported.page
+share/gnome/help/empathy/eu/geolocation-turn.page
+share/gnome/help/empathy/eu/geolocation-what-is.page
+share/gnome/help/empathy/eu/geolocation.page
+share/gnome/help/empathy/eu/group-conversations.page
+share/gnome/help/empathy/eu/hide-contacts.page
+share/gnome/help/empathy/eu/import-account.page
+share/gnome/help/empathy/eu/index.page
+share/gnome/help/empathy/eu/introduction.page
+share/gnome/help/empathy/eu/irc-commands.page
+share/gnome/help/empathy/eu/irc-join-pwd.page
+share/gnome/help/empathy/eu/irc-join-room.page
+share/gnome/help/empathy/eu/irc-manage.page
+share/gnome/help/empathy/eu/irc-nick-password.page
+share/gnome/help/empathy/eu/irc-send-file.page
+share/gnome/help/empathy/eu/irc-start-conversation.page
+share/gnome/help/empathy/eu/license.page
+share/gnome/help/empathy/eu/link-contacts.page
+share/gnome/help/empathy/eu/prev-conv.page
+share/gnome/help/empathy/eu/prob-conn-acctdisabled.page
+share/gnome/help/empathy/eu/prob-conn-auth.page
+share/gnome/help/empathy/eu/prob-conn-name.page
+share/gnome/help/empathy/eu/prob-conn-neterror.page
+share/gnome/help/empathy/eu/prob-conn.page
+share/gnome/help/empathy/eu/remove-account.page
+share/gnome/help/empathy/eu/salut-protocol.page
+share/gnome/help/empathy/eu/send-file.page
+share/gnome/help/empathy/eu/send-message.page
+share/gnome/help/empathy/eu/set-custom-status.page
+share/gnome/help/empathy/eu/share-desktop.page
+share/gnome/help/empathy/eu/status-icons.page
+share/gnome/help/empathy/eu/video-call.page
 share/gnome/help/empathy/fi/account-irc.page
 share/gnome/help/empathy/fi/account-jabber.page
 share/gnome/help/empathy/fi/accounts-window.page
@@ -1205,6 +1265,7 @@ share/locale/zh_TW/LC_MESSAGES/empathy.mo
 share/telepathy/clients/Empathy.AudioVideo.client
 share/telepathy/clients/Empathy.Auth.client
 share/telepathy/clients/Empathy.Chat.client
+share/telepathy/clients/Empathy.FileTransfer.client
 @dirrmtry share/telepathy/clients
 @dirrmtry share/telepathy
 @dirrm share/gnome/help/empathy/zh_CN/figures
@@ -1225,6 +1286,8 @@ share/telepathy/clients/Empathy.Chat.client
 @dirrm share/gnome/help/empathy/fr
 @dirrm share/gnome/help/empathy/fi/figures
 @dirrm share/gnome/help/empathy/fi
+@dirrm share/gnome/help/empathy/eu/figures
+@dirrm share/gnome/help/empathy/eu
 @dirrm share/gnome/help/empathy/es/figures
 @dirrm share/gnome/help/empathy/es
 @dirrm share/gnome/help/empathy/en_GB/figures