Presenting GNOME 2.12 for FreeBSD. The release is chock full of bug fixes

and new features.  Don't believe me?  Then see for yourself at
http://www.gnome.org/start/2.12/notes/en/.

DO NOT USE portupgrade by itself to upgrade to GNOME 2.12.  Instead, use
the gnome_upgrade.sh script from
http://www.marcuscom.com/downloads/gnome_upgrade212.sh.  This script will
circumvent some potential pitfalls users can see if they use portupgrade
by itself.

In keeping with tradition, GNOME 2.12 for FreeBSD comes with a special
splash screen.  The winner of this release's contest is
Dominique Goncalves <dominique.goncalves@gmail.com>.  His splash screen
was inspired by http://art.gnome.org/contests/2.12-splash/83.

The FreeBSD GNOME Team would lank to thank the following users for
their contributions to this release:

Matthew Luckie <mjl@luckie.org.nz>
ade
sajd on #freebsd-gnome
Caelian on #freebsd-gnome
mnag
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Mark Hobden <markhobden@gmail.com>
Sergey Akifyev <asa@agava.com>
Andreas Kohn

For more information on GNOME on FreeBSD, checkout
http://www.FreeBSD.org/gnome/.  The 2.12 documentation will be
posted shortly.

18 files changed, 216 insertions, 136 deletions

diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 40c1328621a0..98687e2548e5 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -3,30 +3,34 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.14 2005/09/07 14:54:53 adamw Exp $
 #
 
 PORTNAME=	gnomekeyringmanager
-PORTVERSION=	0.0.4
-PORTREVISION=	1
+PORTVERSION=	2.12.0
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/0.0
+MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/2.12
 DISTNAME=	gnome-keyring-manager-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME keyring manager
 
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
 LIB_DEPENDS=	gnome-keyring:${PORTSDIR}/security/gnomekeyring
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
+INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui
+CONFIGURE_ARGS=	--with-help-dir=${PREFIX}/share/gnome/help
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+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 6237ee9e1162..640916c094a3 100644
--- a/security/gnome-keyring-manager/distinfo
+++ b/security/gnome-keyring-manager/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-keyring-manager-0.0.4.tar.bz2) = 6c44751e9d5fa25559a751fc9751606f
-SIZE (gnome2/gnome-keyring-manager-0.0.4.tar.bz2) = 385608
+MD5 (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 0a588c64839390e0c6e07250b509a86a
+SIZE (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 380274
diff --git a/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager-keyring-manager.c b/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager-keyring-manager.c
deleted file mode 100644
index 763ead9f9ebe..000000000000
--- a/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager-keyring-manager.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/gnome-keyring-manager-keyring-manager.c.orig	Mon Jul 12 23:14:24 2004
-+++ src/gnome-keyring-manager-keyring-manager.c	Mon Jul 12 23:15:32 2004
-@@ -240,6 +240,13 @@
-   GtkWidget *menubar;
-   GtkWidget *menu_item;
-   GError *error;
-+  SetColumnPrefsData toggle[] = 
-+  {
-+    { COLUMN_LOCK_ON_IDLE, "ToggleLockOnIdle",       "lock-on-idle" },
-+    { COLUMN_LOCK_TIMEOUT, "ToggleLockTimeout",      "lock-timeout" },
-+    { COLUMN_MTIME,        "ToggleModificationTime", "mtime" },
-+    { COLUMN_CTIME,        "ToggleCreationTime",     "ctime" }
-+  };
- 
-   manager->priv = g_new0 (GKMKeyringManagerPrivate, 1);
- 
-@@ -329,13 +336,6 @@
-   g_signal_connect (manager->priv->tree_view, "button-press-event", G_CALLBACK (keyring_tree_button_press_callback), manager);
-   g_signal_connect (manager->priv->tree_view, "popup-menu", G_CALLBACK (keyring_tree_context_menu_callback), manager);
-   
--  SetColumnPrefsData toggle[] = 
--  {
--    { COLUMN_LOCK_ON_IDLE, "ToggleLockOnIdle",       "lock-on-idle" },
--    { COLUMN_LOCK_TIMEOUT, "ToggleLockTimeout",      "lock-timeout" },
--    { COLUMN_MTIME,        "ToggleModificationTime", "mtime" },
--    { COLUMN_CTIME,        "ToggleCreationTime",     "ctime" }
--  };
-   manager->priv->gconf_cnxn_ids = 
-   set_column_visibility_preferences (toggle,
-   				     G_N_ELEMENTS (toggle),
diff --git a/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager-util.c b/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager-util.c
deleted file mode 100644
index 946f458084d7..000000000000
--- a/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager-util.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/gnome-keyring-manager-util.c.orig	Mon Jul 12 23:12:27 2004
-+++ src/gnome-keyring-manager-util.c	Mon Jul 12 23:13:00 2004
-@@ -189,8 +189,6 @@
-   GtkIconTheme *icon_theme;
-   GdkPixbuf *pixbuf;
- 
--  g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
--
-   const char *authors[] = {
-     "Fernando Herrera <fherrera@onirica.com>",
-     "Mariano Su\303\241rez-Alvarez <mariano@gnome.org>",
-@@ -201,6 +199,8 @@
-   };
-   const char *translator_credits = _("translator_credits");
-   
-+  g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
-+
-   icon_theme = gtk_icon_theme_get_default ();
-   pixbuf = gtk_icon_theme_load_icon (icon_theme, "stock_keyring", 48, 0, NULL);
- 	   
diff --git a/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager.c b/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager.c
deleted file mode 100644
index cfb78173e594..000000000000
--- a/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/gnome-keyring-manager.c.orig	Sun Jun 13 22:16:43 2004
-+++ src/gnome-keyring-manager.c	Thu Dec 16 22:58:42 2004
-@@ -312,7 +312,8 @@
-     { "manager", 'm', POPT_ARG_NONE, NULL, OPTION_MANAGER, 
-       N_("Open the keyring manager"), NULL },
-     { "keyring", 'k', POPT_ARG_STRING, NULL, OPTION_KEYRING, 
--      N_("Open the keyring editor for KEYRING"), N_("KEYRING") }
-+      N_("Open the keyring editor for KEYRING"), N_("KEYRING") },
-+    { NULL, '\0', 0, NULL, 0, NULL, NULL }
- };
- 
- int
diff --git a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-acl-display.c b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-acl-display.c
new file mode 100644
index 000000000000..3df8081babdb
--- /dev/null
+++ b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-acl-display.c
@@ -0,0 +1,19 @@
+--- src/gnome-keyring-manager-acl-display.c.orig	Sat Jul  2 02:12:49 2005
++++ src/gnome-keyring-manager-acl-display.c	Sat Jul  2 02:16:31 2005
+@@ -393,13 +393,15 @@ gkm_acl_display_set_acl (GKMAclDisplay *
+       GnomeKeyringAccessType at;
+       GtkTreeIter iter;
+       char *name, *path;
++      const char *app_path;
+ 
+       ac = (GnomeKeyringAccessControl*) tmp->data;
+       name = gnome_keyring_item_ac_get_display_name (ac);
+       path = gnome_keyring_item_ac_get_path_name (ac);
++      app_path = gkm_get_application_path ();
+ 
+       /* We don't want to include ourself in the list. */
+-      if (g_str_equal (path, gkm_get_application_path ()))
++      if (app_path && g_str_equal (path, app_path))
+ 	{
+ 	  self->priv->gkm_ac = gnome_keyring_access_control_copy (ac);
+ 	}
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 000000000000..81a4de59585d
--- /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/files/patch-src_gnome-keyring-manager-util.c b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c
new file mode 100644
index 000000000000..c05c11acf6e4
--- /dev/null
+++ b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c
@@ -0,0 +1,31 @@
+--- src/gnome-keyring-manager-util.c.orig	Wed May 18 16:41:35 2005
++++ src/gnome-keyring-manager-util.c	Sat Jul  2 02:12:38 2005
+@@ -304,8 +304,6 @@ gkm_about_dialog_new (GtkWindow *transie
+ {
+   GtkWidget *about;
+ 
+-  g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
+-
+   const char *authors[] = {
+     "Fernando Herrera <fherrera@onirica.com>",
+     "Mariano Su\303\241rez-Alvarez <mariano@gnome.org>",
+@@ -317,6 +315,8 @@ gkm_about_dialog_new (GtkWindow *transie
+     NULL
+   };
+ 
++  g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
++
+   gtk_about_dialog_set_email_hook ((GtkAboutDialogActivateLinkFunc) gkm_about_dialog_activate_links,
+ 				   GINT_TO_POINTER (LINK_TYPE_EMAIL), NULL);
+ 
+@@ -354,6 +354,10 @@ gkm_get_application_path (void)
+  	{
+ 	  path = g_file_read_link ("/proc/self/exe", NULL);
+ 	}     
++#elif defined(__FreeBSD__)
++	{
++	  path = g_file_read_link ("/proc/curproc/file", NULL);
++	}
+ #endif
+     }
+ 
diff --git a/security/gnome-keyring-manager/pkg-plist b/security/gnome-keyring-manager/pkg-plist
index de199b0c3d26..9b1c28598b19 100644
--- a/security/gnome-keyring-manager/pkg-plist
+++ b/security/gnome-keyring-manager/pkg-plist
@@ -1,5 +1,16 @@
 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
+share/gnome/gnome-keyring-manager/stock_new-key.png
+share/gnome/gnome-keyring-manager/stock_new-keyring.png
+share/gnome/help/gnome-keyring-manager/C/gnome-keyring-manager.xml
+share/gnome/help/gnome-keyring-manager/C/legal.xml
+share/gnome/help/gnome-keyring-manager/uk/gnome-keyring-manager.xml
+share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf
+share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf
 share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/bn/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ca/LC_MESSAGES/gnome-keyring-manager.mo
@@ -10,22 +21,41 @@ share/locale/el/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/en_CA/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/en_GB/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/es/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/et/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/fa/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/fi/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/fr/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/gl/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/gu/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/hi/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/hu/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/it/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ja/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ko/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/lt/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/nb/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/ne/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/nl/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/no/LC_MESSAGES/gnome-keyring-manager.mo
 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/ro/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/ru/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/rw/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/sk/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/sr/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sv/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/th/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/tr/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/uk/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
+@dirrm share/gnome/omf/gnome-keyring-manager
+@dirrm share/gnome/help/gnome-keyring-manager/uk
+@dirrm share/gnome/help/gnome-keyring-manager/C
+@dirrm share/gnome/help/gnome-keyring-manager
+@dirrm share/gnome/gnome-keyring-manager
diff --git a/security/gnomekeyringmanager/Makefile b/security/gnomekeyringmanager/Makefile
index 40c1328621a0..98687e2548e5 100644
--- a/security/gnomekeyringmanager/Makefile
+++ b/security/gnomekeyringmanager/Makefile
@@ -3,30 +3,34 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.14 2005/09/07 14:54:53 adamw Exp $
 #
 
 PORTNAME=	gnomekeyringmanager
-PORTVERSION=	0.0.4
-PORTREVISION=	1
+PORTVERSION=	2.12.0
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/0.0
+MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/2.12
 DISTNAME=	gnome-keyring-manager-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME keyring manager
 
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
 LIB_DEPENDS=	gnome-keyring:${PORTSDIR}/security/gnomekeyring
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
+INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui
+CONFIGURE_ARGS=	--with-help-dir=${PREFIX}/share/gnome/help
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+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 6237ee9e1162..640916c094a3 100644
--- a/security/gnomekeyringmanager/distinfo
+++ b/security/gnomekeyringmanager/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-keyring-manager-0.0.4.tar.bz2) = 6c44751e9d5fa25559a751fc9751606f
-SIZE (gnome2/gnome-keyring-manager-0.0.4.tar.bz2) = 385608
+MD5 (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 0a588c64839390e0c6e07250b509a86a
+SIZE (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 380274
diff --git a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-keyring-manager.c b/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-keyring-manager.c
deleted file mode 100644
index 763ead9f9ebe..000000000000
--- a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-keyring-manager.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/gnome-keyring-manager-keyring-manager.c.orig	Mon Jul 12 23:14:24 2004
-+++ src/gnome-keyring-manager-keyring-manager.c	Mon Jul 12 23:15:32 2004
-@@ -240,6 +240,13 @@
-   GtkWidget *menubar;
-   GtkWidget *menu_item;
-   GError *error;
-+  SetColumnPrefsData toggle[] = 
-+  {
-+    { COLUMN_LOCK_ON_IDLE, "ToggleLockOnIdle",       "lock-on-idle" },
-+    { COLUMN_LOCK_TIMEOUT, "ToggleLockTimeout",      "lock-timeout" },
-+    { COLUMN_MTIME,        "ToggleModificationTime", "mtime" },
-+    { COLUMN_CTIME,        "ToggleCreationTime",     "ctime" }
-+  };
- 
-   manager->priv = g_new0 (GKMKeyringManagerPrivate, 1);
- 
-@@ -329,13 +336,6 @@
-   g_signal_connect (manager->priv->tree_view, "button-press-event", G_CALLBACK (keyring_tree_button_press_callback), manager);
-   g_signal_connect (manager->priv->tree_view, "popup-menu", G_CALLBACK (keyring_tree_context_menu_callback), manager);
-   
--  SetColumnPrefsData toggle[] = 
--  {
--    { COLUMN_LOCK_ON_IDLE, "ToggleLockOnIdle",       "lock-on-idle" },
--    { COLUMN_LOCK_TIMEOUT, "ToggleLockTimeout",      "lock-timeout" },
--    { COLUMN_MTIME,        "ToggleModificationTime", "mtime" },
--    { COLUMN_CTIME,        "ToggleCreationTime",     "ctime" }
--  };
-   manager->priv->gconf_cnxn_ids = 
-   set_column_visibility_preferences (toggle,
-   				     G_N_ELEMENTS (toggle),
diff --git a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-util.c b/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-util.c
deleted file mode 100644
index 946f458084d7..000000000000
--- a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-util.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/gnome-keyring-manager-util.c.orig	Mon Jul 12 23:12:27 2004
-+++ src/gnome-keyring-manager-util.c	Mon Jul 12 23:13:00 2004
-@@ -189,8 +189,6 @@
-   GtkIconTheme *icon_theme;
-   GdkPixbuf *pixbuf;
- 
--  g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
--
-   const char *authors[] = {
-     "Fernando Herrera <fherrera@onirica.com>",
-     "Mariano Su\303\241rez-Alvarez <mariano@gnome.org>",
-@@ -201,6 +199,8 @@
-   };
-   const char *translator_credits = _("translator_credits");
-   
-+  g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
-+
-   icon_theme = gtk_icon_theme_get_default ();
-   pixbuf = gtk_icon_theme_load_icon (icon_theme, "stock_keyring", 48, 0, NULL);
- 	   
diff --git a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager.c b/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager.c
deleted file mode 100644
index cfb78173e594..000000000000
--- a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/gnome-keyring-manager.c.orig	Sun Jun 13 22:16:43 2004
-+++ src/gnome-keyring-manager.c	Thu Dec 16 22:58:42 2004
-@@ -312,7 +312,8 @@
-     { "manager", 'm', POPT_ARG_NONE, NULL, OPTION_MANAGER, 
-       N_("Open the keyring manager"), NULL },
-     { "keyring", 'k', POPT_ARG_STRING, NULL, OPTION_KEYRING, 
--      N_("Open the keyring editor for KEYRING"), N_("KEYRING") }
-+      N_("Open the keyring editor for KEYRING"), N_("KEYRING") },
-+    { NULL, '\0', 0, NULL, 0, NULL, NULL }
- };
- 
- int
diff --git a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-acl-display.c b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-acl-display.c
new file mode 100644
index 000000000000..3df8081babdb
--- /dev/null
+++ b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-acl-display.c
@@ -0,0 +1,19 @@
+--- src/gnome-keyring-manager-acl-display.c.orig	Sat Jul  2 02:12:49 2005
++++ src/gnome-keyring-manager-acl-display.c	Sat Jul  2 02:16:31 2005
+@@ -393,13 +393,15 @@ gkm_acl_display_set_acl (GKMAclDisplay *
+       GnomeKeyringAccessType at;
+       GtkTreeIter iter;
+       char *name, *path;
++      const char *app_path;
+ 
+       ac = (GnomeKeyringAccessControl*) tmp->data;
+       name = gnome_keyring_item_ac_get_display_name (ac);
+       path = gnome_keyring_item_ac_get_path_name (ac);
++      app_path = gkm_get_application_path ();
+ 
+       /* We don't want to include ourself in the list. */
+-      if (g_str_equal (path, gkm_get_application_path ()))
++      if (app_path && g_str_equal (path, app_path))
+ 	{
+ 	  self->priv->gkm_ac = gnome_keyring_access_control_copy (ac);
+ 	}
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 000000000000..81a4de59585d
--- /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/files/patch-src_gnome-keyring-manager-util.c b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c
new file mode 100644
index 000000000000..c05c11acf6e4
--- /dev/null
+++ b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c
@@ -0,0 +1,31 @@
+--- src/gnome-keyring-manager-util.c.orig	Wed May 18 16:41:35 2005
++++ src/gnome-keyring-manager-util.c	Sat Jul  2 02:12:38 2005
+@@ -304,8 +304,6 @@ gkm_about_dialog_new (GtkWindow *transie
+ {
+   GtkWidget *about;
+ 
+-  g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
+-
+   const char *authors[] = {
+     "Fernando Herrera <fherrera@onirica.com>",
+     "Mariano Su\303\241rez-Alvarez <mariano@gnome.org>",
+@@ -317,6 +315,8 @@ gkm_about_dialog_new (GtkWindow *transie
+     NULL
+   };
+ 
++  g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
++
+   gtk_about_dialog_set_email_hook ((GtkAboutDialogActivateLinkFunc) gkm_about_dialog_activate_links,
+ 				   GINT_TO_POINTER (LINK_TYPE_EMAIL), NULL);
+ 
+@@ -354,6 +354,10 @@ gkm_get_application_path (void)
+  	{
+ 	  path = g_file_read_link ("/proc/self/exe", NULL);
+ 	}     
++#elif defined(__FreeBSD__)
++	{
++	  path = g_file_read_link ("/proc/curproc/file", NULL);
++	}
+ #endif
+     }
+ 
diff --git a/security/gnomekeyringmanager/pkg-plist b/security/gnomekeyringmanager/pkg-plist
index de199b0c3d26..9b1c28598b19 100644
--- a/security/gnomekeyringmanager/pkg-plist
+++ b/security/gnomekeyringmanager/pkg-plist
@@ -1,5 +1,16 @@
 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
+share/gnome/gnome-keyring-manager/stock_new-key.png
+share/gnome/gnome-keyring-manager/stock_new-keyring.png
+share/gnome/help/gnome-keyring-manager/C/gnome-keyring-manager.xml
+share/gnome/help/gnome-keyring-manager/C/legal.xml
+share/gnome/help/gnome-keyring-manager/uk/gnome-keyring-manager.xml
+share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf
+share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf
 share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/bn/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ca/LC_MESSAGES/gnome-keyring-manager.mo
@@ -10,22 +21,41 @@ share/locale/el/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/en_CA/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/en_GB/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/es/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/et/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/fa/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/fi/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/fr/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/gl/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/gu/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/hi/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/hu/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/it/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ja/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ko/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/lt/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/nb/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/ne/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/nl/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/no/LC_MESSAGES/gnome-keyring-manager.mo
 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/ro/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/ru/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/rw/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/sk/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/sr/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sv/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/th/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/tr/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/uk/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
+@dirrm share/gnome/omf/gnome-keyring-manager
+@dirrm share/gnome/help/gnome-keyring-manager/uk
+@dirrm share/gnome/help/gnome-keyring-manager/C
+@dirrm share/gnome/help/gnome-keyring-manager
+@dirrm share/gnome/gnome-keyring-manager