aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2006-05-28 15:22:13 +0000
committerPav Lucistnik <pav@FreeBSD.org>2006-05-28 15:22:13 +0000
commit5580b13f7dcec007d64a19f23cbf90b23f0eb914 (patch)
tree09a4fa6bf1a15b7ea095660ee4d3173e8ab0140c
parentc38835dc54f492bfebbb7c21848202a27fe8f81b (diff)
downloadports-5580b13f7dcec007d64a19f23cbf90b23f0eb914.tar.gz
ports-5580b13f7dcec007d64a19f23cbf90b23f0eb914.zip
- Rename ports
security/gnomekeyring -> security/gnome-keyring security/gnomekeyringmanager -> security/gnome-keyring-manager
Notes
Notes: svn path=/head/; revision=163712
-rw-r--r--MOVED2
-rw-r--r--security/Makefile4
-rw-r--r--security/gnome-keyring-manager/Makefile5
-rw-r--r--security/gnome-keyring/Makefile3
-rw-r--r--security/gnomekeyring/Makefile30
-rw-r--r--security/gnomekeyring/distinfo3
-rw-r--r--security/gnomekeyring/files/patch-gnome-keyring-daemon-io.c58
-rw-r--r--security/gnomekeyring/files/patch-gnome-keyring-daemon.c34
-rw-r--r--security/gnomekeyring/files/patch-gnome-keyring.c92
-rw-r--r--security/gnomekeyring/pkg-descr17
-rw-r--r--security/gnomekeyring/pkg-plist64
-rw-r--r--security/gnomekeyringmanager/Makefile36
-rw-r--r--security/gnomekeyringmanager/distinfo3
-rw-r--r--security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-acl-display.c19
-rw-r--r--security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c13
-rw-r--r--security/gnomekeyringmanager/pkg-descr1
-rw-r--r--security/gnomekeyringmanager/pkg-plist69
-rw-r--r--sysutils/gksu/Makefile2
-rw-r--r--x11-toolkits/libgnomeui/Makefile2
-rw-r--r--x11/gnome2/Makefile2
20 files changed, 10 insertions, 449 deletions
diff --git a/MOVED b/MOVED
index 9b8a1d59bf88..c8686c2cbc19 100644
--- a/MOVED
+++ b/MOVED
@@ -2325,3 +2325,5 @@ print/gnomeprint|print/gnome-print|2006-05-28|Renamed to use real vendor package
graphics/libart_lgpl2|graphics/libart_lgpl|2006-05-28|Renamed to use real vendor package name
net/gnomenetstatus|net/gnome-netstatus|2006-05-28|Renamed to use real vendor package name
net/gnomenettool|net/gnome-nettool|2006-05-28|Renamed to use real vendor package name
+security/gnomekeyring|security/gnome-keyring|2006-05-28|Renamed to use real vendor package name
+security/gnomekeyringmanager|security/gnome-keyring-manager|2006-05-28|Renamed to use real vendor package name
diff --git a/security/Makefile b/security/Makefile
index 7fd81da4dc3d..63c8b642c775 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -135,10 +135,10 @@
SUBDIR += gaim-encryption
SUBDIR += gaim-otr
SUBDIR += gcipher
+ SUBDIR += gnome-keyring
+ SUBDIR += gnome-keyring-manager
SUBDIR += gnome-password-generator
SUBDIR += gnome-ssh-askpass
- SUBDIR += gnomekeyring
- SUBDIR += gnomekeyringmanager
SUBDIR += gnu-crypto
SUBDIR += gnupg
SUBDIR += gnupg-devel
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 4f91104654a0..3a17417417c0 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -3,10 +3,9 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.19 2006/04/13 07:52:37 bland Exp $
#
-PORTNAME= gnomekeyringmanager
+PORTNAME= gnome-keyring-manager
PORTVERSION= 2.14.0
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -17,7 +16,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME keyring manager
-LIB_DEPENDS= gnome-keyring:${PORTSDIR}/security/gnomekeyring
+LIB_DEPENDS= gnome-keyring:${PORTSDIR}/security/gnome-keyring
USE_X_PREFIX= yes
USE_BZIP2= yes
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 727c70c9e377..7f6279889303 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,10 +3,9 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/security/gnomekeyring/Makefile,v 1.2 2006/03/13 23:28:20 mezz Exp $
#
-PORTNAME= gnomekeyring
+PORTNAME= gnome-keyring
PORTVERSION= 0.4.9
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/security/gnomekeyring/Makefile b/security/gnomekeyring/Makefile
deleted file mode 100644
index 727c70c9e377..000000000000
--- a/security/gnomekeyring/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for: gnomekeyring
-# Date Created: 08 December 2003
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports-stable/security/gnomekeyring/Makefile,v 1.2 2006/03/13 23:28:20 mezz Exp $
-#
-
-PORTNAME= gnomekeyring
-PORTVERSION= 0.4.9
-CATEGORIES= security gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-keyring/0.4
-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
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.mk>
diff --git a/security/gnomekeyring/distinfo b/security/gnomekeyring/distinfo
deleted file mode 100644
index 95b7192943f4..000000000000
--- a/security/gnomekeyring/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/security/gnomekeyring/files/patch-gnome-keyring-daemon-io.c b/security/gnomekeyring/files/patch-gnome-keyring-daemon-io.c
deleted file mode 100644
index 9c0e02eb14ff..000000000000
--- a/security/gnomekeyring/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/gnomekeyring/files/patch-gnome-keyring-daemon.c b/security/gnomekeyring/files/patch-gnome-keyring-daemon.c
deleted file mode 100644
index 293df59b976f..000000000000
--- a/security/gnomekeyring/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/gnomekeyring/files/patch-gnome-keyring.c b/security/gnomekeyring/files/patch-gnome-keyring.c
deleted file mode 100644
index 728352a8b013..000000000000
--- a/security/gnomekeyring/files/patch-gnome-keyring.c
+++ /dev/null
@@ -1,92 +0,0 @@
---- 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));
-+ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
-+ cmsg.hdr.cmsg_level = SOL_SOCKET;
-+ cmsg.hdr.cmsg_type = SCM_CREDS;
-+#endif
-
- again:
-
-- 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));
-+ 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
-
- 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/gnomekeyring/pkg-descr b/security/gnomekeyring/pkg-descr
deleted file mode 100644
index 75ce77c6ddfd..000000000000
--- a/security/gnomekeyring/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-Gnome-keyring is a program that keep password and other secrets for
-users. It is run as a damon in the session, similar to ssh-agent, and
-other applications can locate it by an environment variable.
-
-The program can manage several keyrings, each with its own master
-password, and there is also a session keyring which is never stored to
-disk, but forgotten when the session ends.
-
-The library libgnome-keyring is used by applications to integrate with
-the gnome keyring system. However, at this point the library hasn't been
-tested and used enought to consider the API to be publically
-exposed. Therefore use of libgnome-keyring is at the moment limited to
-internal use in the gnome desktop. However, we hope that the
-gnome-keyring API will turn out useful and good, so that later it
-can be made public for any application to use.
-
--- Gnome-keyring README
diff --git a/security/gnomekeyring/pkg-plist b/security/gnomekeyring/pkg-plist
deleted file mode 100644
index 38a1d87e863f..000000000000
--- a/security/gnomekeyring/pkg-plist
+++ /dev/null
@@ -1,64 +0,0 @@
-bin/gnome-keyring-daemon
-include/gnome-keyring-1/gnome-keyring.h
-lib/libgnome-keyring.la
-lib/libgnome-keyring.so
-lib/libgnome-keyring.so.0
-libdata/pkgconfig/gnome-keyring-1.pc
-libexec/gnome-keyring-ask
-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/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/el/LC_MESSAGES/gnome-keyring.mo
-share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo
-share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo
-share/locale/es/LC_MESSAGES/gnome-keyring.mo
-share/locale/et/LC_MESSAGES/gnome-keyring.mo
-share/locale/eu/LC_MESSAGES/gnome-keyring.mo
-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/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/ko/LC_MESSAGES/gnome-keyring.mo
-share/locale/lt/LC_MESSAGES/gnome-keyring.mo
-share/locale/mn/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/pa/LC_MESSAGES/gnome-keyring.mo
-share/locale/pl/LC_MESSAGES/gnome-keyring.mo
-share/locale/pt/LC_MESSAGES/gnome-keyring.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-keyring.mo
-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/sq/LC_MESSAGES/gnome-keyring.mo
-share/locale/sr/LC_MESSAGES/gnome-keyring.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-keyring.mo
-share/locale/sv/LC_MESSAGES/gnome-keyring.mo
-share/locale/ta/LC_MESSAGES/gnome-keyring.mo
-share/locale/th/LC_MESSAGES/gnome-keyring.mo
-share/locale/tr/LC_MESSAGES/gnome-keyring.mo
-share/locale/uk/LC_MESSAGES/gnome-keyring.mo
-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
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrm include/gnome-keyring-1
diff --git a/security/gnomekeyringmanager/Makefile b/security/gnomekeyringmanager/Makefile
deleted file mode 100644
index 4f91104654a0..000000000000
--- a/security/gnomekeyringmanager/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# New ports collection makefile for: gnomekeyringmanager
-# Date created: 2004 12 July
-# Whom: Adam Weinberger <adamw@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.19 2006/04/13 07:52:37 bland Exp $
-#
-
-PORTNAME= gnomekeyringmanager
-PORTVERSION= 2.14.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}
-DIST_SUBDIR= gnome2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= GNOME keyring manager
-
-LIB_DEPENDS= gnome-keyring:${PORTSDIR}/security/gnomekeyring
-
-USE_X_PREFIX= 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"
-
-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
deleted file mode 100644
index f453addc7767..000000000000
--- a/security/gnomekeyringmanager/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-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
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
deleted file mode 100644
index 3df8081babdb..000000000000
--- a/security/gnomekeyringmanager/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/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 3291d28419ec..000000000000
--- a/security/gnomekeyringmanager/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/gnomekeyringmanager/pkg-descr b/security/gnomekeyringmanager/pkg-descr
deleted file mode 100644
index c6881629b867..000000000000
--- a/security/gnomekeyringmanager/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This a keyring management program for the GNOME Desktop.
diff --git a/security/gnomekeyringmanager/pkg-plist b/security/gnomekeyringmanager/pkg-plist
deleted file mode 100644
index feae65637b2d..000000000000
--- a/security/gnomekeyringmanager/pkg-plist
+++ /dev/null
@@ -1,69 +0,0 @@
-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/es/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-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
-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/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/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/es
-@dirrm share/gnome/help/gnome-keyring-manager/C
-@dirrm share/gnome/help/gnome-keyring-manager
-@dirrm share/gnome/gnome-keyring-manager
diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
index 3d6179d4458a..9959c75fd155 100644
--- a/sysutils/gksu/Makefile
+++ b/sysutils/gksu/Makefile
@@ -15,7 +15,7 @@ COMMENT= Graphical frontend to su
LIB_DEPENDS= gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui \
- gnome-keyring.0:${PORTSDIR}/security/gnomekeyring
+ gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
USE_X_PREFIX= yes
USE_GNOME= gtk20 pkgconfig gnomeprefix gnomehack gconf2 intlhack
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 61d65246af62..b61ad52b36b8 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -22,7 +22,7 @@ PREFIX?= ${X11BASE}
PORTREVISION= 1
-LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnomekeyring \
+LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
startup-notification-1.0:${PORTSDIR}/x11/startup-notification
RUN_DEPENDS= ${X11BASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index a7150771e172..e585466c048b 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -57,7 +57,7 @@ RUN_DEPENDS?= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2
gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
${X11BASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
sound-juicer:${PORTSDIR}/audio/sound-juicer \
- gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager \
+ gnome-keyring-manager:${PORTSDIR}/security/gnome-keyring-manager \
${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \
evince:${PORTSDIR}/graphics/evince \
${X11BASE}/libexec/fast-user-switch-applet:${PORTSDIR}/x11/fast-user-switch-applet \