Update to 2.27.4.

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

8 files changed, 21 insertions, 27 deletions

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 9a1757a5d..3473af4be 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -3,7 +3,7 @@
 #
 # $FreeBSD$
 #	$NetBSD: $
-#     $MCom: ports/Mk/bsd.gnome.mk,v 1.480 2009/04/13 19:06:39 marcus Exp $
+#     $MCom: ports/Mk/bsd.gnome.mk,v 1.481 2009/06/03 05:16:15 marcus Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -522,7 +522,7 @@ gnomesharp20_RUN_DEPENDS=	${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-
 gnomesharp20_USE_GNOME_IMPL=	gnomepanel gtkhtml3 gtksharp20 librsvg2 vte
 
 libgnomekbd_DETECT=			${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc
-libgnomekbd_LIB_DEPENDS=	gnomekbd.3:${PORTSDIR}/x11/libgnomekbd
+libgnomekbd_LIB_DEPENDS=	gnomekbd.4:${PORTSDIR}/x11/libgnomekbd
 libgnomekbd_USE_GNOME_IMPL=	libgnomeui
 
 pygtksourceview_DETECT=		${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 7647f4d37..afc5b9c42 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -3,11 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/empathy/Makefile,v 1.28 2009/06/15 20:16:29 kwm Exp $
+#    $MCom: ports/net-im/empathy/Makefile,v 1.29 2009/07/15 11:42:51 avl Exp $
 
 PORTNAME=	empathy
-PORTVERSION=	2.27.3
-PORTREVISION=	2
+PORTVERSION=	2.27.4
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
 
diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo
index 8aed47401..c21ce4b9c 100644
--- a/net-im/empathy/distinfo
+++ b/net-im/empathy/distinfo
@@ -1,3 +1,3 @@
-MD5 (empathy-2.27.3.tar.bz2) = 082624ff1ea1086b8f64658a0949fcc5
-SHA256 (empathy-2.27.3.tar.bz2) = 03b656ddaea74a78d0cb246824df77a7319f000b3da697ea47287811e7e6d6c2
-SIZE (empathy-2.27.3.tar.bz2) = 2048026
+MD5 (empathy-2.27.4.tar.bz2) = 16b5b2adc6303b8c924208f33254a770
+SHA256 (empathy-2.27.4.tar.bz2) = 7146fe530a8d1f3cd76e394264757e76338a689de853f44ac8978d103142e2d7
+SIZE (empathy-2.27.4.tar.bz2) = 2147124
diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist
index b2ee1054e..85720e419 100644
--- a/net-im/empathy/pkg-plist
+++ b/net-im/empathy/pkg-plist
@@ -25,11 +25,14 @@ include/libempathy-gtk/empathy-geometry.h
 include/libempathy-gtk/empathy-gtk-enum-types.h
 include/libempathy-gtk/empathy-images.h
 include/libempathy-gtk/empathy-irc-network-dialog.h
+include/libempathy-gtk/empathy-kludge-label.h
 include/libempathy-gtk/empathy-log-window.h
 include/libempathy-gtk/empathy-new-message-dialog.h
+include/libempathy-gtk/empathy-plist.h
 include/libempathy-gtk/empathy-presence-chooser.h
 include/libempathy-gtk/empathy-profile-chooser.h
 include/libempathy-gtk/empathy-smiley-manager.h
+include/libempathy-gtk/empathy-sound.h
 include/libempathy-gtk/empathy-spell.h
 include/libempathy-gtk/empathy-status-preset-dialog.h
 %%ADIUM%%include/libempathy-gtk/empathy-theme-adium.h
@@ -39,6 +42,7 @@ include/libempathy-gtk/empathy-theme-manager.h
 include/libempathy-gtk/empathy-ui-utils.h
 include/libempathy-gtk/empathy-video-src.h
 include/libempathy-gtk/empathy-video-widget.h
+include/libempathy/empathy-account.h
 include/libempathy/empathy-account-manager.h
 include/libempathy/empathy-call-factory.h
 include/libempathy/empathy-call-handler.h
@@ -50,6 +54,7 @@ include/libempathy/empathy-contact-manager.h
 include/libempathy/empathy-contact-monitor.h
 include/libempathy/empathy-contact.h
 include/libempathy/empathy-debug.h
+include/libempathy/empathy-debugger.h
 include/libempathy/empathy-dispatch-operation.h
 include/libempathy/empathy-dispatcher.h
 include/libempathy/empathy-enum-types.h
@@ -113,6 +118,7 @@ share/doc/libempathy-gtk/EmpathyGstAudioSrc.html
 share/doc/libempathy-gtk/EmpathyGstVideoSrc.html
 share/doc/libempathy-gtk/EmpathyPresenceChooser.html
 share/doc/libempathy-gtk/EmpathySmileyManager.html
+share/doc/libempathy-gtk/EmpathyStatusPresetDialog.html
 share/doc/libempathy-gtk/EmpathyThemeBoxes.html
 share/doc/libempathy-gtk/EmpathyThemeIrc.html
 share/doc/libempathy-gtk/EmpathyThemeManager.html
@@ -417,6 +423,7 @@ share/locale/nb/LC_MESSAGES/empathy.mo
 share/locale/ne/LC_MESSAGES/empathy.mo
 share/locale/nl/LC_MESSAGES/empathy.mo
 share/locale/oc/LC_MESSAGES/empathy.mo
+share/locale/or/LC_MESSAGES/empathy.mo
 share/locale/pa/LC_MESSAGES/empathy.mo
 share/locale/pl/LC_MESSAGES/empathy.mo
 share/locale/ps/LC_MESSAGES/empathy.mo
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 9b51079ca..588b99520 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnomekbd/Makefile,v 1.31 2009/05/26 18:51:46 kwm Exp $
+#   $MCom: ports/x11/libgnomekbd/Makefile,v 1.32 2009/07/06 04:34:32 marcus Exp $
 #
 
 PORTNAME=	libgnomekbd
-PORTVERSION=	2.27.2
-PORTREVISION=	1
+PORTVERSION=	2.27.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index f942f7025..406c6c27a 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomekbd-2.27.2.tar.bz2) = ea5a1f1965373b4506c07c64aae9a0c4
-SHA256 (gnome2/libgnomekbd-2.27.2.tar.bz2) = a6a74c336205a7e46c81da4f749c37756fb5b4ea56aaf345a3a6c37d36660df7
-SIZE (gnome2/libgnomekbd-2.27.2.tar.bz2) = 387594
+MD5 (gnome2/libgnomekbd-2.27.4.tar.bz2) = f5bd68f8e71d093e0f9721ff952b179b
+SHA256 (gnome2/libgnomekbd-2.27.4.tar.bz2) = c1b4f057e384e2c97c24b0c87554345ce5e7a973243ce735dee5a360047415c9
+SIZE (gnome2/libgnomekbd-2.27.4.tar.bz2) = 365531
diff --git a/x11/libgnomekbd/files/patch-libgnomekbd_gkbd-indicator.c b/x11/libgnomekbd/files/patch-libgnomekbd_gkbd-indicator.c
deleted file mode 100644
index 3a40bf997..000000000
--- a/x11/libgnomekbd/files/patch-libgnomekbd_gkbd-indicator.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomekbd/gkbd-indicator.c.orig	2009-07-06 00:27:46.000000000 -0400
-+++ libgnomekbd/gkbd-indicator.c	2009-07-06 00:27:57.000000000 -0400
-@@ -717,7 +717,7 @@ gkbd_indicator_global_init (void)
- 	globals.registry =
- 	    xkl_config_registry_get_instance (globals.engine);
- 
--	xkl_config_registry_load (globals.registry);
-+	xkl_config_registry_load (globals.registry, TRUE);
- 
- 	gconf_client = gconf_client_get_default ();
- 
diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist
index 61c81bf98..d2e29c318 100644
--- a/x11/libgnomekbd/pkg-plist
+++ b/x11/libgnomekbd/pkg-plist
@@ -9,11 +9,11 @@ include/libgnomekbd/gkbd-util.h
 lib/libgnomekbd.a
 lib/libgnomekbd.la
 lib/libgnomekbd.so
-lib/libgnomekbd.so.3
+lib/libgnomekbd.so.4
 lib/libgnomekbdui.a
 lib/libgnomekbdui.la
 lib/libgnomekbdui.so
-lib/libgnomekbdui.so.3
+lib/libgnomekbdui.so.4
 libdata/pkgconfig/libgnomekbd.pc
 libdata/pkgconfig/libgnomekbdui.pc
 share/applications/gkbd-indicator-plugins-capplet.desktop