5 files changed, 7 insertions, 72 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 897f8bd23aa8..eaeecc506371 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	2.26.1
-PORTREVISION=	1
+PORTVERSION=	2.26.3
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 0cea189d417d..a5ac9a98bfbe 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-2.26.1.tar.bz2) = 060b349a0aae130fdd3cd0a9827258c6
-SHA256 (gnome2/gnome-keyring-2.26.1.tar.bz2) = 47a79a7963652c19d9f566289fdb49ca286bfb1bef32b7e1032eb36c49bf7926
-SIZE (gnome2/gnome-keyring-2.26.1.tar.bz2) = 2738687
+MD5 (gnome2/gnome-keyring-2.26.3.tar.bz2) = d7639185dce46c26cf2e7d2a75028f78
+SHA256 (gnome2/gnome-keyring-2.26.3.tar.bz2) = 319eef68f9c82225dcce06d2f6cfda9196da66a799459b8a00da9bb490529539
+SIZE (gnome2/gnome-keyring-2.26.3.tar.bz2) = 2692915
diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure
deleted file mode 100644
index 4ffb1972567e..000000000000
--- a/security/gnome-keyring/files/patch-configure
+++ /dev/null
@@ -1,56 +0,0 @@
---- configure.orig	2009-04-13 00:24:12.000000000 -0400
-+++ configure	2009-04-13 00:24:58.000000000 -0400
-@@ -19198,7 +19198,7 @@ fi
- 
- { $as_echo "$as_me:$LINENO: checking build test tools, unit tests, and -Werror" >&5
- $as_echo_n "checking build test tools, unit tests, and -Werror... " >&6; }
--if test "$enable_tests" == "yes"; then
-+if test "$enable_tests" = "yes"; then
- 
- cat >>confdefs.h <<_ACEOF
- #define WITH_TESTS 1
-@@ -19214,7 +19214,7 @@ $as_echo "no" >&6; }
-   	tests_status="no"
- fi
- 
-- if test "$enable_tests" == "yes"; then
-+ if test "$enable_tests" = "yes"; then
-   WITH_TESTS_TRUE=
-   WITH_TESTS_FALSE='#'
- else
-@@ -19229,7 +19229,7 @@ if test "${enable_coverage+set}" = set; 
- fi
- 
- 
--if test "$enable_coverage" == "yes"; then
-+if test "$enable_coverage" = "yes"; then
- 	CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
- 	LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage"
- fi
-@@ -19247,7 +19247,7 @@ fi
- $as_echo_n "checking valgrind... " >&6; }
- valgrind_status="yes"
- 
-- if test "$enable_valgrind" == "run"; then
-+ if test "$enable_valgrind" = "run"; then
-   WITH_VALGRIND_TRUE=
-   WITH_VALGRIND_FALSE='#'
- else
-@@ -19328,7 +19328,7 @@ fi
- 
- 
- # Build valgrind support into code
--if test "$enable_valgrind" == "yes"; then
-+if test "$enable_valgrind" = "yes"; then
- 	if test "${ac_cv_header_valgrind_valgrind_h+set}" = set; then
-   { $as_echo "$as_me:$LINENO: checking for valgrind/valgrind.h" >&5
- $as_echo_n "checking for valgrind/valgrind.h... " >&6; }
-@@ -19463,7 +19463,7 @@ else
- fi
- 
- 
--	if test "$have_valgrind" == "no"; then
-+	if test "$have_valgrind" = "no"; then
- 		{ { $as_echo "$as_me:$LINENO: error: The valgrind headers are missing" >&5
- $as_echo "$as_me: error: The valgrind headers are missing" >&2;}
-    { (exit 1); exit 1; }; }
diff --git a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in
deleted file mode 100644
index 32ffb1b09819..000000000000
--- a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 48bf9475f89e..25da7d59382f 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -120,6 +120,7 @@ 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/ca@valencia/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
@@ -219,6 +220,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES