Presenting GNOME 2.26 for FreeBSD. See

http://library.gnome.org/misc/release-notes/2.26/ for a list of what's new.
On the FreeBSD front, we introduced a port of libxul 1.9 as an alternative
for Firefox 2.0 as a Gecko provider.  Almost all of the Gecko consumers
can make use of this provider by setting:

WITH_GECKO=libxul

The GNOME 2.26 port was done by ahze, kwm, marcus, and mezz with
contributions by Joseph S. Atkinson, Peter Wemm, Eric L. Chen,
Martin Matuska, Craig Butler, and Pawel Worach.

9 files changed, 70 insertions, 62 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index ccccabba4c4d..def4e8097bc8 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring/Makefile,v 1.71 2009/01/10 01:59:21 mezz Exp $
+#   $MCom: ports/security/gnome-keyring/Makefile,v 1.76 2009/03/15 00:23:43 marcus Exp $
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	2.24.1
-PORTREVISION=	2
+PORTVERSION=	2.26.0
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index ca5144c4a5e6..f34ad439b1c5 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-2.24.1.tar.bz2) = aa5552dc129f3509ee39145b7f0bf977
-SHA256 (gnome2/gnome-keyring-2.24.1.tar.bz2) = 3c9eb7f45dd0026340635b9e1ee18c36a47541610aa5a7ef604ca645aa4763f9
-SIZE (gnome2/gnome-keyring-2.24.1.tar.bz2) = 1125993
+MD5 (gnome2/gnome-keyring-2.26.0.tar.bz2) = 0395fcf79b990465030a2795dcddacb9
+SHA256 (gnome2/gnome-keyring-2.26.0.tar.bz2) = 7acda11db2eb07b2f68a1a506203fe95141954acb10c394850418fd04ed80a07
+SIZE (gnome2/gnome-keyring-2.26.0.tar.bz2) = 1211953
diff --git a/security/gnome-keyring/files/patch-common_gkr-daemon-util.h b/security/gnome-keyring/files/patch-common_gkr-daemon-util.h
deleted file mode 100644
index ebc3f9680b4c..000000000000
--- a/security/gnome-keyring/files/patch-common_gkr-daemon-util.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/gkr-daemon-util.h.orig	2008-08-04 13:36:06.000000000 -0400
-+++ common/gkr-daemon-util.h	2008-08-04 13:36:18.000000000 -0400
-@@ -26,6 +26,8 @@
- 
- G_BEGIN_DECLS
- 
-+#include <sys/types.h>
-+
- #include <glib.h>
- #include <glib-object.h>
- 
diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure
index 75016a356fcb..9aff6d9ebf19 100644
--- a/security/gnome-keyring/files/patch-configure
+++ b/security/gnome-keyring/files/patch-configure
@@ -1,24 +1,15 @@
---- configure.orig	2008-07-22 21:14:15.000000000 -0400
-+++ configure	2008-07-22 21:14:35.000000000 -0400
-@@ -25963,7 +25963,7 @@ fi
- 
- 	dbus_status=$DBUS_VERSION
- fi
-- if test "$enable_dbus" == "yes"; then
-+ if test "$enable_dbus" = "yes"; then
-   WITH_DBUS_TRUE=
-   WITH_DBUS_FALSE='#'
- else
-@@ -27001,7 +27001,7 @@ if test "${enable_tests+set}" = set; the
- fi
- 
+--- configure.orig	2009-02-24 21:18:47.000000000 +0100
++++ configure	2009-02-24 21:19:24.000000000 +0100
+@@ -18069,7 +18069,7 @@
  
+ { echo "$as_me:$LINENO: checking build test tools, unit tests, and -Werror" >&5
+ echo $ECHO_N "checking build test tools, unit tests, and -Werror... $ECHO_C" >&6; }
 -if test "$enable_tests" == "yes"; then
 +if test "$enable_tests" = "yes"; then
- 	echo "building tests and unit tests"
  
  cat >>confdefs.h <<_ACEOF
-@@ -27014,7 +27014,7 @@ else
+ #define WITH_TESTS 1
+@@ -18085,7 +18085,7 @@
    	tests_status="no"
  fi
  
@@ -27,7 +18,7 @@
    WITH_TESTS_TRUE=
    WITH_TESTS_FALSE='#'
  else
-@@ -27029,7 +27029,7 @@ if test "${enable_coverage+set}" = set; 
+@@ -18100,7 +18100,7 @@
  fi
  
  
diff --git a/security/gnome-keyring/files/patch-egg_egg-asn1.h b/security/gnome-keyring/files/patch-egg_egg-asn1.h
new file mode 100644
index 000000000000..a3d4296af2e4
--- /dev/null
+++ b/security/gnome-keyring/files/patch-egg_egg-asn1.h
@@ -0,0 +1,14 @@
+--- egg/egg-asn1.h.orig	2009-02-25 16:40:49.000000000 -0500
++++ egg/egg-asn1.h	2009-02-25 16:41:21.000000000 -0500
+@@ -75,9 +75,9 @@ gchar*             egg_asn1_read_dn     
+ gchar*             egg_asn1_read_dn_part                  (ASN1_TYPE asn, const gchar *part, const gchar *match);
+ 
+ 
+-glong              egg_asn1_time_parse_utc                (const gchar* value);
++time_t              egg_asn1_time_parse_utc                (const gchar* value);
+ 
+-glong              egg_asn1_time_parse_general            (const gchar* value);
++time_t              egg_asn1_time_parse_general            (const gchar* value);
+ 
+ 
+ typedef void       (*EggAsn1DnCallback)                   (guint index, GQuark oid, const guchar *value,
diff --git a/security/gnome-keyring/files/patch-pam_gkr-pam-client.c b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c
deleted file mode 100644
index 05a0306e6913..000000000000
--- a/security/gnome-keyring/files/patch-pam_gkr-pam-client.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- pam/gkr-pam-client.c.orig	2008-10-07 12:25:23.000000000 -0400
-+++ pam/gkr-pam-client.c	2008-10-07 12:38:36.000000000 -0400
-@@ -96,12 +96,12 @@ check_peer_same_uid (int sock)
-         struct xucred xuc;
-         socklen_t xuc_len = sizeof (xuc);
- 
--	if (getsockopt (sock, SOL_SOCKET, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && 
--	    xuc_len == sizeof (xuc)) {
-+	if (getsockopt (sock, 0, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && 
-+	    xuc.cr_version == XUCRED_VERSION) {
- 	    	uid = xuc.cr_uid;
- 	} else {
- 		syslog (GKR_LOG_ERR, "could not get gnome-keyring-daemon socket credentials, "
--		        "(returned len %d/%d)\n", xuc_len, (int)sizeof (xuc));
-+		        "(returned version %d/%d)\n", xuc.cr_version, XUCRED_VERSION);
- 		return -1;   
- 	}
- 	
diff --git a/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c
deleted file mode 100644
index 57d2f1888016..000000000000
--- a/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- pkcs11/gkr-pkcs11-module.c.orig	2008-02-11 21:26:56.000000000 -0500
-+++ pkcs11/gkr-pkcs11-module.c	2008-02-11 21:27:08.000000000 -0500
-@@ -36,6 +36,7 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- 
-+#include <string.h>
- #include <stdlib.h>
- #include <stdint.h>
- #include <pthread.h>
diff --git a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in
new file mode 100644
index 000000000000..32ffb1b09819
--- /dev/null
+++ b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in
@@ -0,0 +1,11 @@
+--- pkcs11/rpc-layer/Makefile.in.orig	2009-02-24 21:22:45.000000000 +0100
++++ pkcs11/rpc-layer/Makefile.in	2009-02-24 21:22:52.000000000 +0100
+@@ -348,7 +348,7 @@ gck_rpc_daemon_standalone_SOURCES = \
+ 	gck-rpc-daemon-standalone.c
+ 
+ gck_rpc_daemon_standalone_LDADD = \
+-	-ldl libgck-rpc-layer.la \
++	libgck-rpc-layer.la \
+ 	$(top_builddir)/common/libgkr-common.la
+ 
+ all: all-am
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 2b3fe4715134..9ba05cb2fa2c 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -1,5 +1,13 @@
 bin/gnome-keyring
 bin/gnome-keyring-daemon
+etc/xdg/autostart/gnome-keyring-daemon.desktop
+include/gcr/gcr-certificate-basics-widget.h
+include/gcr/gcr-certificate-details-widget.h
+include/gcr/gcr-certificate.h
+include/gcr/gcr-importer.h
+include/gcr/gcr-parser.h
+include/gcr/gcr-types.h
+include/gcr/gcr.h
 include/gnome-keyring-1/gnome-keyring-memory.h
 include/gnome-keyring-1/gnome-keyring-result.h
 include/gnome-keyring-1/gnome-keyring.h
@@ -7,9 +15,22 @@ include/gp11/gp11.h
 include/gp11/pkcs11.h
 include/gp11/pkcs11g.h
 include/gp11/pkcs11n.h
+lib/gnome-keyring/devel/gck-ssh-store-standalone.a
+lib/gnome-keyring/devel/gck-ssh-store-standalone.la
+lib/gnome-keyring/devel/gck-ssh-store-standalone.so
+lib/gnome-keyring/devel/gck-user-store-standalone.a
+lib/gnome-keyring/devel/gck-user-store-standalone.la
+lib/gnome-keyring/devel/gck-user-store-standalone.so
 lib/gnome-keyring/gnome-keyring-pkcs11.a
 lib/gnome-keyring/gnome-keyring-pkcs11.la
 lib/gnome-keyring/gnome-keyring-pkcs11.so
+lib/gnome-keyring/standalone/gck-roots-store-standalone.a
+lib/gnome-keyring/standalone/gck-roots-store-standalone.la
+lib/gnome-keyring/standalone/gck-roots-store-standalone.so
+lib/libgcr.a
+lib/libgcr.la
+lib/libgcr.so
+lib/libgcr.so.0
 lib/libgnome-keyring.a
 lib/libgnome-keyring.la
 lib/libgnome-keyring.so
@@ -21,6 +42,7 @@ lib/libgp11.so.0
 lib/pam_gnome_keyring.a
 lib/pam_gnome_keyring.la
 lib/pam_gnome_keyring.so
+libdata/pkgconfig/gcr-0.pc
 libdata/pkgconfig/gnome-keyring-1.pc
 libdata/pkgconfig/gp11-0.pc
 libexec/gnome-keyring-ask
@@ -63,7 +85,10 @@ share/doc/gp11/left.png
 share/doc/gp11/right.png
 share/doc/gp11/style.css
 share/doc/gp11/up.png
+share/gcr/ui/gcr-certificate-basics-widget.ui
+share/gcr/ui/gcr-import-dialog.ui
 share/locale/ar/LC_MESSAGES/gnome-keyring.mo
+share/locale/ast/LC_MESSAGES/gnome-keyring.mo
 share/locale/az/LC_MESSAGES/gnome-keyring.mo
 share/locale/be/LC_MESSAGES/gnome-keyring.mo
 share/locale/be@latin/LC_MESSAGES/gnome-keyring.mo
@@ -139,9 +164,14 @@ share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrm share/doc/gp11
 @dirrm %%DOCSDIR%%
+@dirrm lib/gnome-keyring/standalone
+@dirrm lib/gnome-keyring/devel
 @dirrm lib/gnome-keyring
 @dirrm include/gp11
 @dirrm include/gnome-keyring-1
+@dirrm include/gcr
+@dirrm share/gcr/ui
+@dirrm share/gcr
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -166,3 +196,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast