Update to 2.11.1.

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

8 files changed, 50 insertions, 8 deletions

diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 4021c78f6..508789309 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomekeyringmanager
-PORTVERSION=	2.11.0
+PORTVERSION=	2.11.1
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/2.11
@@ -27,6 +27,7 @@ USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=		gnome-keyring-manger.1
+MAN1=		gnome-keyring-manager.1
 GCONF_SCHEMAS=	gnome-keyring-manager.schemas
+
 .include <bsd.port.mk>
diff --git a/security/gnome-keyring-manager/distinfo b/security/gnome-keyring-manager/distinfo
index 958ab5cb2..4a3dd0384 100644
--- a/security/gnome-keyring-manager/distinfo
+++ b/security/gnome-keyring-manager/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-keyring-manager-2.11.0.tar.bz2) = 553718a1c8888419fbc1033083ce5984
-SIZE (gnome2/gnome-keyring-manager-2.11.0.tar.bz2) = 352630
+MD5 (gnome2/gnome-keyring-manager-2.11.1.tar.bz2) = 40ebad8d9ad27732d75760aa1503e560
+SIZE (gnome2/gnome-keyring-manager-2.11.1.tar.bz2) = 417761
diff --git a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-main-ui.c b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-main-ui.c
new file mode 100644
index 000000000..81a4de595
--- /dev/null
+++ b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-main-ui.c
@@ -0,0 +1,18 @@
+--- src/gnome-keyring-manager-main-ui.c.orig	Fri Jun 10 19:59:37 2005
++++ src/gnome-keyring-manager-main-ui.c	Fri Jun 10 19:59:45 2005
+@@ -1100,6 +1100,7 @@ gkm_main_ui_initialize_menu (GKMMainUI *
+ {
+   GtkWidget *menubar;
+   GtkAccelGroup *accel_group;
++  GError *error = NULL;
+ 
+   self->priv->action_group = gtk_action_group_new ("MenuActions"); 
+   gtk_action_group_add_actions (self->priv->action_group, entries, 
+@@ -1111,7 +1112,6 @@ gkm_main_ui_initialize_menu (GKMMainUI *
+ 				      self->priv->action_group, 0);
+   accel_group = gtk_ui_manager_get_accel_group (self->priv->ui_manager);
+   gtk_window_add_accel_group (GTK_WINDOW (self->priv->window), accel_group);
+-  GError *error = NULL;
+   if (!gtk_ui_manager_add_ui_from_file (self->priv->ui_manager,
+ 					GLADEDIR MENU_FILE,
+ 					&error))
diff --git a/security/gnome-keyring-manager/pkg-plist b/security/gnome-keyring-manager/pkg-plist
index f2dad4991..fc14f16f6 100644
--- a/security/gnome-keyring-manager/pkg-plist
+++ b/security/gnome-keyring-manager/pkg-plist
@@ -1,5 +1,6 @@
 bin/gnome-keyring-manager
 share/gnome/applications/gnome-keyring-manager.desktop
+share/gnome/gnome-keyring-manager/gnome-keyring-manager-ui.xml
 share/gnome/gnome-keyring-manager/gnome-keyring-manager.glade
 share/gnome/gnome-keyring-manager/stock_delete-key.png
 share/gnome/gnome-keyring-manager/stock_delete-keyring.png
@@ -33,6 +34,7 @@ share/locale/pa/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/pl/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/pt/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/rw/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sv/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/uk/LC_MESSAGES/gnome-keyring-manager.mo
diff --git a/security/gnomekeyringmanager/Makefile b/security/gnomekeyringmanager/Makefile
index 4021c78f6..508789309 100644
--- a/security/gnomekeyringmanager/Makefile
+++ b/security/gnomekeyringmanager/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomekeyringmanager
-PORTVERSION=	2.11.0
+PORTVERSION=	2.11.1
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/2.11
@@ -27,6 +27,7 @@ USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=		gnome-keyring-manger.1
+MAN1=		gnome-keyring-manager.1
 GCONF_SCHEMAS=	gnome-keyring-manager.schemas
+
 .include <bsd.port.mk>
diff --git a/security/gnomekeyringmanager/distinfo b/security/gnomekeyringmanager/distinfo
index 958ab5cb2..4a3dd0384 100644
--- a/security/gnomekeyringmanager/distinfo
+++ b/security/gnomekeyringmanager/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-keyring-manager-2.11.0.tar.bz2) = 553718a1c8888419fbc1033083ce5984
-SIZE (gnome2/gnome-keyring-manager-2.11.0.tar.bz2) = 352630
+MD5 (gnome2/gnome-keyring-manager-2.11.1.tar.bz2) = 40ebad8d9ad27732d75760aa1503e560
+SIZE (gnome2/gnome-keyring-manager-2.11.1.tar.bz2) = 417761
diff --git a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c
new file mode 100644
index 000000000..81a4de595
--- /dev/null
+++ b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c
@@ -0,0 +1,18 @@
+--- src/gnome-keyring-manager-main-ui.c.orig	Fri Jun 10 19:59:37 2005
++++ src/gnome-keyring-manager-main-ui.c	Fri Jun 10 19:59:45 2005
+@@ -1100,6 +1100,7 @@ gkm_main_ui_initialize_menu (GKMMainUI *
+ {
+   GtkWidget *menubar;
+   GtkAccelGroup *accel_group;
++  GError *error = NULL;
+ 
+   self->priv->action_group = gtk_action_group_new ("MenuActions"); 
+   gtk_action_group_add_actions (self->priv->action_group, entries, 
+@@ -1111,7 +1112,6 @@ gkm_main_ui_initialize_menu (GKMMainUI *
+ 				      self->priv->action_group, 0);
+   accel_group = gtk_ui_manager_get_accel_group (self->priv->ui_manager);
+   gtk_window_add_accel_group (GTK_WINDOW (self->priv->window), accel_group);
+-  GError *error = NULL;
+   if (!gtk_ui_manager_add_ui_from_file (self->priv->ui_manager,
+ 					GLADEDIR MENU_FILE,
+ 					&error))
diff --git a/security/gnomekeyringmanager/pkg-plist b/security/gnomekeyringmanager/pkg-plist
index f2dad4991..fc14f16f6 100644
--- a/security/gnomekeyringmanager/pkg-plist
+++ b/security/gnomekeyringmanager/pkg-plist
@@ -1,5 +1,6 @@
 bin/gnome-keyring-manager
 share/gnome/applications/gnome-keyring-manager.desktop
+share/gnome/gnome-keyring-manager/gnome-keyring-manager-ui.xml
 share/gnome/gnome-keyring-manager/gnome-keyring-manager.glade
 share/gnome/gnome-keyring-manager/stock_delete-key.png
 share/gnome/gnome-keyring-manager/stock_delete-keyring.png
@@ -33,6 +34,7 @@ share/locale/pa/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/pl/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/pt/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/rw/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sv/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/uk/LC_MESSAGES/gnome-keyring-manager.mo