Update to 2.91.90.

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

4 files changed, 85 insertions, 15 deletions

diff --git a/net-im/empathy3/Makefile b/net-im/empathy3/Makefile
index ee2a51c2b..b4e503977 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.4 2011/02/02 00:02:40 kwm Exp $
+#    $MCom: ports/net-im/empathy3/Makefile,v 1.5 2011/02/15 09:34:00 kwm Exp $
 
 PORTNAME=	empathy
-PORTVERSION=	2.91.6.1
-PORTREVISION=	1
+PORTVERSION=	2.91.90
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
 
@@ -59,8 +58,8 @@ OPTIONS=	JABBER	"Enable jabber (XMPP) client support" on \
 		SALUT	"Enable link-local (serverless) XMPP support" off \
 		HAZE	"Enable libpurple protocol integration" off \
 		WEBKIT	"Enable Adium Message Style themes" on \
+		MAP	"Enable graphical map support" on
 #		NST	"Enable Nautilus SendTo plugin"	on \
-#		MAP	"Enable graphical map support" on
 
 .include <bsd.port.pre.mk>
 
@@ -104,13 +103,13 @@ PLIST_SUB+=	NST="@comment "
 #.endif
 
 # needs ported to gtk3
-#.if !defined(WITHOUT_MAP)
-#LIB_DEPENDS+=	champlain-0.8.1:${PORTSDIR}/graphics/libchamplain
-#CONFIGURE_ARGS+=--enable-map
-#PLIST_SUB+=	MAP=""
-#.else
+.if !defined(WITHOUT_MAP)
+LIB_DEPENDS+=	champlain-0.10.0:${PORTSDIR}/graphics/libchamplain010
+CONFIGURE_ARGS+=--enable-map
+PLIST_SUB+=	MAP=""
+.else
 CONFIGURE_ARGS+=--disable-map
 PLIST_SUB+=	MAP="@comment "
-#.endif
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net-im/empathy3/distinfo b/net-im/empathy3/distinfo
index 52c1351ba..93853ad9c 100644
--- a/net-im/empathy3/distinfo
+++ b/net-im/empathy3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (empathy-2.91.6.1.tar.bz2) = a50a5f84ac45cb2c565e27d94d66670db693fd768d128c25a4ec609bf5fa3471
-SIZE (empathy-2.91.6.1.tar.bz2) = 3018547
+SHA256 (empathy-2.91.90.tar.bz2) = 38b68fac8761064d1d48aab99311817f9c4c6a0553187e76528c83e4ca9821ad
+SIZE (empathy-2.91.90.tar.bz2) = 3129399
diff --git a/net-im/empathy3/files/patch-configure b/net-im/empathy3/files/patch-configure
index 9da66f7a8..af505202a 100644
--- a/net-im/empathy3/files/patch-configure
+++ b/net-im/empathy3/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2011-01-24 12:26:18.000000000 +0000
-+++ configure	2011-01-24 12:53:12.000000000 +0000
-@@ -13358,8 +13358,8 @@
+--- 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 = \
@@ -11,3 +11,70 @@
  
  install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid)
  	@$(NORMAL_INSTALL)
+@@ -15968,21 +15968,21 @@
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+-       champlain-0.10
+        champlain-gtk-0.10
++       champlain-0.10
+        clutter-gtk-1.0
+     \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "
+-       champlain-0.10
+        champlain-gtk-0.10
++       champlain-0.10
+        clutter-gtk-1.0
+     ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_LIBCHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags "
+-       champlain-0.10
+        champlain-gtk-0.10
++       champlain-0.10
+        clutter-gtk-1.0
+     " 2>/dev/null`
+ else
+@@ -15996,21 +15996,21 @@
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+-       champlain-0.10
+        champlain-gtk-0.10
++       champlain-0.10
+        clutter-gtk-1.0
+     \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "
+-       champlain-0.10
+        champlain-gtk-0.10
++       champlain-0.10
+        clutter-gtk-1.0
+     ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_LIBCHAMPLAIN_LIBS=`$PKG_CONFIG --libs "
+-       champlain-0.10
+        champlain-gtk-0.10
++       champlain-0.10
+        clutter-gtk-1.0
+     " 2>/dev/null`
+ else
+@@ -16033,14 +16033,14 @@
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+ 	        LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+-       champlain-0.10
+        champlain-gtk-0.10
++       champlain-0.10
+        clutter-gtk-1.0
+     " 2>&1`
+         else
+ 	        LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+-       champlain-0.10
+        champlain-gtk-0.10
++       champlain-0.10
+        clutter-gtk-1.0
+     " 2>&1`
+         fi
diff --git a/net-im/empathy3/pkg-plist b/net-im/empathy3/pkg-plist
index 3a66139bf..580521386 100644
--- a/net-im/empathy3/pkg-plist
+++ b/net-im/empathy3/pkg-plist
@@ -1146,6 +1146,7 @@ share/locale/eo/LC_MESSAGES/empathy.mo
 share/locale/es/LC_MESSAGES/empathy.mo
 share/locale/et/LC_MESSAGES/empathy.mo
 share/locale/eu/LC_MESSAGES/empathy.mo
+share/locale/fa/LC_MESSAGES/empathy.mo
 share/locale/fi/LC_MESSAGES/empathy.mo
 share/locale/fr/LC_MESSAGES/empathy.mo
 share/locale/ga/LC_MESSAGES/empathy.mo
@@ -1195,6 +1196,7 @@ share/locale/tr/LC_MESSAGES/empathy.mo
 share/locale/ug/LC_MESSAGES/empathy.mo
 share/locale/uk/LC_MESSAGES/empathy.mo
 share/locale/vi/LC_MESSAGES/empathy.mo
+share/locale/zu/LC_MESSAGES/empathy.mo
 share/locale/zh_CN/LC_MESSAGES/empathy.mo
 share/locale/zh_HK/LC_MESSAGES/empathy.mo
 share/locale/zh_TW/LC_MESSAGES/empathy.mo
@@ -1263,6 +1265,8 @@ share/telepathy/clients/Empathy.Chat.client
 @dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES