5 files changed, 74 insertions, 44 deletions

diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 3a17417417c0..b6d29bb0a216 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -3,14 +3,13 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/security/gnome-keyring-manager/Makefile,v 1.24 2006/10/02 05:07:37 bland Exp $
 #
 
 PORTNAME=	gnome-keyring-manager
-PORTVERSION=	2.14.0
+PORTVERSION=	2.16.0
 CATEGORIES=	security gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-keyring-manager-${PORTVERSION}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -18,14 +17,13 @@ COMMENT=	GNOME keyring manager
 
 LIB_DEPENDS=	gnome-keyring:${PORTSDIR}/security/gnome-keyring
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui gnomedocutils
-CONFIGURE_ARGS=	--with-help-dir=${PREFIX}/share/gnome/help
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/security/gnome-keyring-manager/distinfo b/security/gnome-keyring-manager/distinfo
index f453addc7767..7232f84c4134 100644
--- a/security/gnome-keyring-manager/distinfo
+++ b/security/gnome-keyring-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-manager-2.14.0.tar.bz2) = d4e38c7b7da99885fa898917e10d8aeb
-SHA256 (gnome2/gnome-keyring-manager-2.14.0.tar.bz2) = f1182d7e560e485a9e3a9d7e983cbb09849caad21010d7c801c68ce19822b030
-SIZE (gnome2/gnome-keyring-manager-2.14.0.tar.bz2) = 391387
+MD5 (gnome2/gnome-keyring-manager-2.16.0.tar.bz2) = d63bfa5e9cfe334694438a74c157344c
+SHA256 (gnome2/gnome-keyring-manager-2.16.0.tar.bz2) = 23f0449af7cba89f4ae26c8e67f1d09bc45389f9dcd7349d2e6540620571051c
+SIZE (gnome2/gnome-keyring-manager-2.16.0.tar.bz2) = 454066
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
deleted file mode 100644
index 3df8081babdb..000000000000
--- a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-acl-display.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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-util.c b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c
deleted file mode 100644
index 3291d28419ec..000000000000
--- a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
-@@ -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 feae65637b2d..d81312492e16 100644
--- a/security/gnome-keyring-manager/pkg-plist
+++ b/security/gnome-keyring-manager/pkg-plist
@@ -9,22 +9,29 @@ 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/es/gnome-keyring-manager.xml
+share/gnome/help/gnome-keyring-manager/fr/gnome-keyring-manager.xml
+share/gnome/help/gnome-keyring-manager/sv/gnome-keyring-manager.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-es.omf
+share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-fr.omf
+share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-sv.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/bn_IN/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ca/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/cs/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/cy/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/da/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/de/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/dz/LC_MESSAGES/gnome-keyring-manager.mo
 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/eu/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
@@ -32,14 +39,23 @@ 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/id/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/ka/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/lv/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/mg/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/mk/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/ml/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/mn/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/mr/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/nn/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/or/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
@@ -48,10 +64,12 @@ 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/sl/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/ta/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
@@ -59,11 +77,57 @@ share/locale/vi/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
 @dirrm share/gnome/omf/gnome-keyring-manager
 @dirrm share/gnome/help/gnome-keyring-manager/uk
+@dirrm share/gnome/help/gnome-keyring-manager/sv
+@dirrm share/gnome/help/gnome-keyring-manager/fr
 @dirrm share/gnome/help/gnome-keyring-manager/es
 @dirrm share/gnome/help/gnome-keyring-manager/C
 @dirrm share/gnome/help/gnome-keyring-manager
 @dirrm share/gnome/gnome-keyring-manager
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN