Presenting GNOME 2.16.1 for FreeBSD. This release represents a massive

amount of work by the FreeBSD GNOME Team and our testers.

On top of the usual GNOME update, we have taken this opportunity to move
GNOME from X11BASE to LOCALBASE.  This means roughly 600 ports NOT part of
the GNOME Desktop also need to be changed.  The bulk of the move was carried
out by ahze, mezz, and pav, but it would not have been possible without
cooperation from the FreeBSD KDE team who worked with us to make sure
GNOME and KDE can still coexist happily.  We would also like to send a
shout out to kris and pointyhat for putting up with multiple test runs
until we got something that was solid.

Back to GNOME 2.16.  This release brings a huge amount of new functionality
to FreeBSD.  The standard release notes can be read at
http://www.gnome.org/start/2.16/ .  But on top of what you will read there,
jylefort and marcus have completed work on a port of HAL to FreeBSD.  This
will allow FreeBSD to take advantage of closer hardware interaction such
as auto-mounting CD-ROMs, USB drives, and music players; auto-playing
audio CDs; and managing laptop power consumption.

But where would this all be without our loyal testers and contributors?
Therefore, the FreeBSD GNOME team would like to thank the following users:

Phillip Neumann <pneumann@gmail.com>
tmclaugh
mux
Yuri Pankov <yuri.pankov@gmail.com>
chinsan
Thomas <freebsdlists@bsdunix.ch>
Brian Gruber <knightbg@yahoo.com>
Franz Klammer <klammer@webonaut.com>
Dominique Goncalves <dominique.goncalves@gmail.com>
Pascal Hofstee <caelian@gmail.com>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
backyard <backyard1454-bsd@yahoo.com>
Andris Raugulis <endrju@null.lv> <endrju@null.lv>
Eric L. Chen <d9364104@mail.nchu.edu.tw>
Pawel Worach <pawel.worach@gmail.com>
QuiRK on #freebsd-gnome
Shane Bell <decept0@gmail.com>
luigi
sajd on #freebsd-gnome
sat
Chris Coleman <chrisc@vmunix.com>
kaeru on #freebsd-gnome
crsd_ via irc.freenode.org/#FreeBSD-GNOME
Joel Diaz <joeldiaz@mac.com>

Enjoy!

Approved by:	portmgr (implicit, kris)

11 files changed, 169 insertions, 225 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
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 7f6279889303..8165fcb447cd 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -6,23 +6,24 @@
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	0.4.9
+PORTVERSION=	0.6.0
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-keyring/0.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	gnome-keyring-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program that keeps passwords and other secrets
 
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gtk20
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--disable-gtk-doc \
+		--with-html-dir=${GNOME_HTML_DIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 95b7192943f4..cc9681ae150a 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-0.4.9.tar.bz2) = 9a90820acf11a66e4c3dd9e163231071
-SHA256 (gnome2/gnome-keyring-0.4.9.tar.bz2) = 6e287d88c3a4ce8c64bb6b0de151c210ecb20e487d5e1c757ef0ad941a37d393
-SIZE (gnome2/gnome-keyring-0.4.9.tar.bz2) = 396162
+MD5 (gnome2/gnome-keyring-0.6.0.tar.bz2) = 1e3a3a12b19fc5ebe95363658c2256d8
+SHA256 (gnome2/gnome-keyring-0.6.0.tar.bz2) = 649f2a0d5298b896781d0ac563b8ea1be7f3fe07fd17ea43b0ec0562be47769f
+SIZE (gnome2/gnome-keyring-0.6.0.tar.bz2) = 476280
diff --git a/security/gnome-keyring/files/patch-gnome-keyring-daemon-io.c b/security/gnome-keyring/files/patch-gnome-keyring-daemon-io.c
deleted file mode 100644
index 9c0e02eb14ff..000000000000
--- a/security/gnome-keyring/files/patch-gnome-keyring-daemon-io.c
+++ /dev/null
@@ -1,58 +0,0 @@
---- gnome-keyring-daemon-io.c.orig	Wed May  4 03:17:18 2005
-+++ gnome-keyring-daemon-io.c	Sat Jul 16 21:46:13 2005
-@@ -100,14 +100,17 @@ read_unix_socket_credentials (int fd,
- 	char buf;
- 	
- #ifdef HAVE_CMSGCRED 
--	char cmsgmem[CMSG_SPACE (sizeof (struct cmsgcred))];
--	struct cmsghdr *cmsg = (struct cmsghdr *) cmsgmem;
-+	struct cmsgcred *cred;
-+	union {
-+		struct cmsghdr hdr;
-+		char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
-+	} cmsg;
- #endif
- 	
- 	*pid = 0;
- 	*uid = 0;
- 	
--#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
-+#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) && !defined(__FreeBSD__)
- 	/* Set the socket to receive credentials on the next message */
- 	{
- 		int on = 1;
-@@ -126,9 +129,9 @@ read_unix_socket_credentials (int fd,
- 	msg.msg_iovlen = 1;
- 	
- #ifdef HAVE_CMSGCRED
--	memset (cmsgmem, 0, sizeof (cmsgmem));
--	msg.msg_control = cmsgmem;
--	msg.msg_controllen = sizeof (cmsgmem);
-+	memset (&cmsg, 0, sizeof (cmsg));
-+	msg.msg_control = (caddr_t) &cmsg;
-+	msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
- #endif
- 
-  again:
-@@ -147,7 +150,8 @@ read_unix_socket_credentials (int fd,
- 	}
- 
- #ifdef HAVE_CMSGCRED
--	if (cmsg->cmsg_len < sizeof (cmsgmem) || cmsg->cmsg_type != SCM_CREDS) {
-+	if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred)) ||
-+	    cmsg.hdr.cmsg_type != SCM_CREDS) {
- 		g_warning ("Message from recvmsg() was not SCM_CREDS\n");
- 		return FALSE;
- 	}
-@@ -168,10 +172,7 @@ read_unix_socket_credentials (int fd,
- 			return FALSE;
- 		}
- #elif defined(HAVE_CMSGCRED)
--		struct cmsgcred *cred;
--		
--		cred = (struct cmsgcred *) CMSG_DATA (cmsg);
--		
-+		cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
- 		*pid = cred->cmcred_pid;
- 		*uid = cred->cmcred_euid;
- #else /* !SO_PEERCRED && !HAVE_CMSGCRED */
diff --git a/security/gnome-keyring/files/patch-gnome-keyring-daemon.c b/security/gnome-keyring/files/patch-gnome-keyring-daemon.c
deleted file mode 100644
index 293df59b976f..000000000000
--- a/security/gnome-keyring/files/patch-gnome-keyring-daemon.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- gnome-keyring-daemon.c.orig	Tue Jul 20 22:41:27 2004
-+++ gnome-keyring-daemon.c	Tue Jul 20 22:43:03 2004
-@@ -121,7 +121,7 @@
- 	int i;
- 
- 	got_random = FALSE;
--#ifdef __linux__
-+#if defined(__linux__) || defined(__FreeBSD__)
- 	{
- 		int fd;
- 
-@@ -352,6 +352,22 @@
- 			app_ref->pathname[len] = 0;
- 		}
- 		
-+	}
-+#elif defined(__FreeBSD__)
-+	{
-+		char buffer[1024];
-+		int len;
-+		char *path;
-+
-+		path = g_strdup_printf ("/proc/%d/file", pid);
-+		len = readlink (path, buffer, sizeof (buffer));
-+		g_free (path);
-+
-+		if (len > 0) {
-+			app_ref->pathname = g_malloc (len + 1);
-+			memcpy (app_ref->pathname, buffer, len);
-+			app_ref->pathname[len] = 0;
-+		}
- 	}
- #endif
- 
diff --git a/security/gnome-keyring/files/patch-gnome-keyring.c b/security/gnome-keyring/files/patch-gnome-keyring.c
index 728352a8b013..27a981e6c083 100644
--- a/security/gnome-keyring/files/patch-gnome-keyring.c
+++ b/security/gnome-keyring/files/patch-gnome-keyring.c
@@ -1,92 +1,30 @@
---- gnome-keyring.c.orig	Fri May 27 03:54:22 2005
-+++ gnome-keyring.c	Sat Jul 16 21:49:24 2005
-@@ -36,6 +36,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <sys/uio.h>
- #include <sys/un.h>
- #include <stdarg.h>
- 
-@@ -253,11 +254,39 @@ write_credentials_byte_sync (int socket)
- {
-   char buf;
-   int bytes_written;
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+  union {
-+	  struct cmsghdr hdr;
-+	  char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
-+  } cmsg;
-+  struct iovec iov;
-+  struct msghdr msg;
-+#endif
-+
-+  buf = 0;
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+  iov.iov_base = &buf;
-+  iov.iov_len = 1;
-+
-+  memset (&msg, 0, sizeof (msg));
-+  msg.msg_iov = &iov;
-+  msg.msg_iovlen = 1;
-+
-+  msg.msg_control = (caddr_t) &cmsg;
-+  msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
-+  memset (&cmsg, 0, sizeof (cmsg));
+--- gnome-keyring.c.orig	Mon Apr 24 06:21:29 2006
++++ gnome-keyring.c	Mon Jun 12 14:24:47 2006
+@@ -275,9 +275,9 @@ write_credentials_byte_sync (int socket)
+   msg.msg_control = (caddr_t) &cmsg;
+   msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+   memset (&cmsg, 0, sizeof (cmsg));
+-  cmsg->cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+-  cmsg->cmsg_level = SOL_SOCKET;
+-  cmsg->cmsg_type = SCM_CREDS;
 +  cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
 +  cmsg.hdr.cmsg_level = SOL_SOCKET;
 +  cmsg.hdr.cmsg_type = SCM_CREDS;
-+#endif
+ #endif
  
   again:
+@@ -324,10 +324,10 @@ write_credentials_byte (GnomeKeyringOper
  
--  buf = 0;
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+  bytes_written = sendmsg (socket, &msg, 0);
-+#else
-   bytes_written = write (socket, &buf, 1);
-+#endif
- 
-   if (bytes_written < 0 && errno == EINTR)
-     goto again;
-@@ -275,11 +304,39 @@ write_credentials_byte (GnomeKeyringOper
- {
-   char buf;
-   int bytes_written;
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+  union {
-+	  struct cmsghdr hdr;
-+	  char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
-+  } cmsg;
-+  struct iovec iov;
-+  struct msghdr msg;
-+#endif
-+
-+  buf = 0;
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+  iov.iov_base = &buf;
-+  iov.iov_len = 1;
-+
-+  memset (&msg, 0, sizeof (msg));
-+  msg.msg_iov = &iov;
-+  msg.msg_iovlen = 1;
-+
-+  msg.msg_control = (caddr_t) &cmsg;
-+  msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+   msg.msg_control = (caddr_t) &cmsg;
+   msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+-  memset (cmsg, 0, sizeof (cmsg));
+-  cmsg->cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+-  cmsg->cmsg_level = SOL_SOCKET;
+-  cmsg->cmsg_type = SCM_CREDS;
 +  memset (&cmsg, 0, sizeof (cmsg));
 +  cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
 +  cmsg.hdr.cmsg_level = SOL_SOCKET;
 +  cmsg.hdr.cmsg_type = SCM_CREDS;
-+#endif
+ #endif
  
   again:
- 
--  buf = 0;
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+  bytes_written = sendmsg (op->socket, &msg, 0);
-+#else
-   bytes_written = write (op->socket, &buf, 1);
-+#endif
- 
-   if (bytes_written < 0 && errno == EINTR)
-     goto again;
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 38a1d87e863f..470fb7c669e8 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -5,16 +5,29 @@ lib/libgnome-keyring.so
 lib/libgnome-keyring.so.0
 libdata/pkgconfig/gnome-keyring-1.pc
 libexec/gnome-keyring-ask
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring.html
+%%DOCSDIR%%/gnome-keyring.devhelp
+%%DOCSDIR%%/gnome-keyring.devhelp2
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
 share/locale/ar/LC_MESSAGES/gnome-keyring.mo
 share/locale/az/LC_MESSAGES/gnome-keyring.mo
 share/locale/bg/LC_MESSAGES/gnome-keyring.mo
 share/locale/bn/LC_MESSAGES/gnome-keyring.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo
 share/locale/bs/LC_MESSAGES/gnome-keyring.mo
 share/locale/ca/LC_MESSAGES/gnome-keyring.mo
 share/locale/cs/LC_MESSAGES/gnome-keyring.mo
 share/locale/cy/LC_MESSAGES/gnome-keyring.mo
 share/locale/da/LC_MESSAGES/gnome-keyring.mo
 share/locale/de/LC_MESSAGES/gnome-keyring.mo
+share/locale/dz/LC_MESSAGES/gnome-keyring.mo
 share/locale/el/LC_MESSAGES/gnome-keyring.mo
 share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo
 share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo
@@ -25,20 +38,28 @@ share/locale/fa/LC_MESSAGES/gnome-keyring.mo
 share/locale/fi/LC_MESSAGES/gnome-keyring.mo
 share/locale/fr/LC_MESSAGES/gnome-keyring.mo
 share/locale/gl/LC_MESSAGES/gnome-keyring.mo
+share/locale/gu/LC_MESSAGES/gnome-keyring.mo
+share/locale/hi/LC_MESSAGES/gnome-keyring.mo
 share/locale/hr/LC_MESSAGES/gnome-keyring.mo
 share/locale/hu/LC_MESSAGES/gnome-keyring.mo
 share/locale/id/LC_MESSAGES/gnome-keyring.mo
 share/locale/is/LC_MESSAGES/gnome-keyring.mo
 share/locale/it/LC_MESSAGES/gnome-keyring.mo
 share/locale/ja/LC_MESSAGES/gnome-keyring.mo
+share/locale/ka/LC_MESSAGES/gnome-keyring.mo
 share/locale/ko/LC_MESSAGES/gnome-keyring.mo
 share/locale/lt/LC_MESSAGES/gnome-keyring.mo
+share/locale/lv/LC_MESSAGES/gnome-keyring.mo
+share/locale/mg/LC_MESSAGES/gnome-keyring.mo
+share/locale/mk/LC_MESSAGES/gnome-keyring.mo
+share/locale/ml/LC_MESSAGES/gnome-keyring.mo
 share/locale/mn/LC_MESSAGES/gnome-keyring.mo
+share/locale/mr/LC_MESSAGES/gnome-keyring.mo
 share/locale/ms/LC_MESSAGES/gnome-keyring.mo
 share/locale/nb/LC_MESSAGES/gnome-keyring.mo
 share/locale/ne/LC_MESSAGES/gnome-keyring.mo
 share/locale/nl/LC_MESSAGES/gnome-keyring.mo
-share/locale/no/LC_MESSAGES/gnome-keyring.mo
+share/locale/or/LC_MESSAGES/gnome-keyring.mo
 share/locale/pa/LC_MESSAGES/gnome-keyring.mo
 share/locale/pl/LC_MESSAGES/gnome-keyring.mo
 share/locale/pt/LC_MESSAGES/gnome-keyring.mo
@@ -47,6 +68,7 @@ share/locale/ro/LC_MESSAGES/gnome-keyring.mo
 share/locale/ru/LC_MESSAGES/gnome-keyring.mo
 share/locale/rw/LC_MESSAGES/gnome-keyring.mo
 share/locale/sk/LC_MESSAGES/gnome-keyring.mo
+share/locale/sl/LC_MESSAGES/gnome-keyring.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring.mo
 share/locale/sr/LC_MESSAGES/gnome-keyring.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-keyring.mo
@@ -59,6 +81,51 @@ share/locale/xh/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
+@dirrm %%DOCSDIR%%
+@dirrm include/gnome-keyring-1
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
-@dirrm include/gnome-keyring-1
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@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/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