update to 2.28.1

This switches to the gnome-2.28 release branch.

5 files changed, 95 insertions, 96 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index ccad251ff32..c44b8225661 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.84 2009/08/26 19:56:58 sno Exp $
+# $NetBSD: Makefile,v 1.85 2009/10/24 12:53:55 drochner Exp $
 
-DISTNAME=	seahorse-2.26.2
-PKGREVISION=	1
+DISTNAME=	seahorse-2.28.1
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.26/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.28/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -43,7 +42,7 @@ GCONF_SCHEMAS= 	seahorse.schemas
 .include "../../databases/gnome-mime-data/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf/schemas.mk"
-.include "../../devel/libglade/buildlink3.mk"
+#.include "../../devel/libglade/buildlink3.mk"
 .include "../../net/avahi/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../security/gnome-keyring/buildlink3.mk"
diff --git a/security/seahorse/PLIST b/security/seahorse/PLIST
index 959e57f4a63..b39128a8b80 100644
--- a/security/seahorse/PLIST
+++ b/security/seahorse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/06/14 18:13:38 joerg Exp $
+@comment $NetBSD: PLIST,v 1.23 2009/10/24 12:53:55 drochner Exp $
 bin/seahorse
 bin/seahorse-daemon
 include/libcryptui/cryptui-key-chooser.h
@@ -21,6 +21,8 @@ share/gnome/help/seahorse/C/legal.xml
 share/gnome/help/seahorse/C/seahorse.xml
 share/gnome/help/seahorse/ca/figures/seahorse-window.png
 share/gnome/help/seahorse/ca/seahorse.xml
+share/gnome/help/seahorse/cs/figures/seahorse-window.png
+share/gnome/help/seahorse/cs/seahorse.xml
 share/gnome/help/seahorse/de/figures/seahorse-window.png
 share/gnome/help/seahorse/de/seahorse.xml
 share/gnome/help/seahorse/el/figures/seahorse-window.png
@@ -61,6 +63,51 @@ share/gtk-doc/html/libcryptui/libcryptui.devhelp2
 share/gtk-doc/html/libcryptui/right.png
 share/gtk-doc/html/libcryptui/style.css
 share/gtk-doc/html/libcryptui/up.png
+share/gtk-doc/html/libseahorse/api-index-full.html
+share/gtk-doc/html/libseahorse/ch01.html
+share/gtk-doc/html/libseahorse/home.png
+share/gtk-doc/html/libseahorse/index.html
+share/gtk-doc/html/libseahorse/index.sgml
+share/gtk-doc/html/libseahorse/left.png
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseCommands.html
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseContext.html
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseKeyserverControl.html
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseMultiOperation.html
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseObject.html
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseObjectModel.html
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseObjectWidget.html
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseSecureEntry.html
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseServiceDiscovery.html
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseSet.html
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseSetModel.html
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseUnknown.html
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseUnknownSource.html
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseWidget.html
+share/gtk-doc/html/libseahorse/libseahorse-SeahorseXxx.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-check-button-control.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-combo-keys.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-gconf.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-gtkstock.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-libdialogs.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-marshal.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-passphrase.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-prefs.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-progress.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-secure-memory.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-servers.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-source.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-transfer-operation.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-types.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-unix-signal.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-util.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-validity.html
+share/gtk-doc/html/libseahorse/libseahorse-seahorse-view.html
+share/gtk-doc/html/libseahorse/libseahorse.devhelp
+share/gtk-doc/html/libseahorse/libseahorse.devhelp2
+share/gtk-doc/html/libseahorse/object-tree.html
+share/gtk-doc/html/libseahorse/right.png
+share/gtk-doc/html/libseahorse/style.css
+share/gtk-doc/html/libseahorse/up.png
 share/icons/hicolor/16x16/apps/seahorse-preferences.png
 share/icons/hicolor/16x16/apps/seahorse.png
 share/icons/hicolor/22x22/apps/seahorse-preferences.png
@@ -76,10 +123,12 @@ share/locale/as/LC_MESSAGES/seahorse.mo
 share/locale/az/LC_MESSAGES/seahorse.mo
 share/locale/be@latin/LC_MESSAGES/seahorse.mo
 share/locale/bg/LC_MESSAGES/seahorse.mo
-share/locale/bn/LC_MESSAGES/seahorse.mo
 share/locale/bn_IN/LC_MESSAGES/seahorse.mo
+share/locale/br/LC_MESSAGES/seahorse.mo
 share/locale/ca/LC_MESSAGES/seahorse.mo
+share/locale/ca@valencia/LC_MESSAGES/seahorse.mo
 share/locale/cs/LC_MESSAGES/seahorse.mo
+share/locale/cy/LC_MESSAGES/seahorse.mo
 share/locale/da/LC_MESSAGES/seahorse.mo
 share/locale/de/LC_MESSAGES/seahorse.mo
 share/locale/dz/LC_MESSAGES/seahorse.mo
@@ -105,6 +154,7 @@ share/locale/ko/LC_MESSAGES/seahorse.mo
 share/locale/ku/LC_MESSAGES/seahorse.mo
 share/locale/lt/LC_MESSAGES/seahorse.mo
 share/locale/lv/LC_MESSAGES/seahorse.mo
+share/locale/mai/LC_MESSAGES/seahorse.mo
 share/locale/mk/LC_MESSAGES/seahorse.mo
 share/locale/ml/LC_MESSAGES/seahorse.mo
 share/locale/mr/LC_MESSAGES/seahorse.mo
@@ -139,6 +189,7 @@ share/locale/zh_HK/LC_MESSAGES/seahorse.mo
 share/locale/zh_TW/LC_MESSAGES/seahorse.mo
 share/omf/seahorse/seahorse-C.omf
 share/omf/seahorse/seahorse-ca.omf
+share/omf/seahorse/seahorse-cs.omf
 share/omf/seahorse/seahorse-de.omf
 share/omf/seahorse/seahorse-el.omf
 share/omf/seahorse/seahorse-en_GB.omf
@@ -176,30 +227,31 @@ share/pixmaps/seahorse/scalable/seahorse-sign-bad.svg
 share/pixmaps/seahorse/scalable/seahorse-sign-ok.svg
 share/pixmaps/seahorse/scalable/seahorse-sign-unknown.svg
 share/pixmaps/seahorse/scalable/seahorse-sign.svg
-share/seahorse/glade/seahorse-add-keyring.glade
-share/seahorse/glade/seahorse-add-keyserver.glade
-share/seahorse/glade/seahorse-add-subkey.glade
-share/seahorse/glade/seahorse-add-uid.glade
-share/seahorse/glade/seahorse-change-passphrase.glade
-share/seahorse/glade/seahorse-expires.glade
-share/seahorse/glade/seahorse-generate-select.glade
-share/seahorse/glade/seahorse-gkr-item-properties.glade
-share/seahorse/glade/seahorse-gkr-keyring.glade
-share/seahorse/glade/seahorse-key-manager.glade
-share/seahorse/glade/seahorse-key-manager.ui
-share/seahorse/glade/seahorse-keyserver-results.glade
-share/seahorse/glade/seahorse-keyserver-results.ui
-share/seahorse/glade/seahorse-keyserver-search.glade
-share/seahorse/glade/seahorse-keyserver-sync.glade
-share/seahorse/glade/seahorse-notify.glade
-share/seahorse/glade/seahorse-pgp-generate.glade
-share/seahorse/glade/seahorse-pgp-private-key-properties.glade
-share/seahorse/glade/seahorse-pgp-public-key-properties.glade
-share/seahorse/glade/seahorse-prefs.glade
-share/seahorse/glade/seahorse-progress.glade
-share/seahorse/glade/seahorse-revoke.glade
-share/seahorse/glade/seahorse-sign.glade
-share/seahorse/glade/seahorse-signer.glade
-share/seahorse/glade/seahorse-ssh-generate.glade
-share/seahorse/glade/seahorse-ssh-key-properties.glade
-share/seahorse/glade/seahorse-ssh-upload.glade
+share/seahorse/ui/seahorse-add-keyring.xml
+share/seahorse/ui/seahorse-add-keyserver.xml
+share/seahorse/ui/seahorse-add-subkey.xml
+share/seahorse/ui/seahorse-add-uid.xml
+share/seahorse/ui/seahorse-change-passphrase.xml
+share/seahorse/ui/seahorse-expires.xml
+share/seahorse/ui/seahorse-generate-select.xml
+share/seahorse/ui/seahorse-gkr-add-item.xml
+share/seahorse/ui/seahorse-gkr-item-properties.xml
+share/seahorse/ui/seahorse-gkr-keyring.xml
+share/seahorse/ui/seahorse-key-manager.ui
+share/seahorse/ui/seahorse-key-manager.xml
+share/seahorse/ui/seahorse-keyserver-results.ui
+share/seahorse/ui/seahorse-keyserver-results.xml
+share/seahorse/ui/seahorse-keyserver-search.xml
+share/seahorse/ui/seahorse-keyserver-sync.xml
+share/seahorse/ui/seahorse-notify.xml
+share/seahorse/ui/seahorse-pgp-generate.xml
+share/seahorse/ui/seahorse-pgp-private-key-properties.xml
+share/seahorse/ui/seahorse-pgp-public-key-properties.xml
+share/seahorse/ui/seahorse-prefs.xml
+share/seahorse/ui/seahorse-progress.xml
+share/seahorse/ui/seahorse-revoke.xml
+share/seahorse/ui/seahorse-sign.xml
+share/seahorse/ui/seahorse-signer.xml
+share/seahorse/ui/seahorse-ssh-generate.xml
+share/seahorse/ui/seahorse-ssh-key-properties.xml
+share/seahorse/ui/seahorse-ssh-upload.xml
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index dd990f7ea51..71fbcfff44e 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.30 2009/05/21 10:41:23 wiz Exp $
+$NetBSD: distinfo,v 1.31 2009/10/24 12:53:55 drochner Exp $
 
-SHA1 (seahorse-2.26.2.tar.bz2) = 04484352e92fc2faa6f06ee6f4eb21828931f173
-RMD160 (seahorse-2.26.2.tar.bz2) = 9193e5c14244f1a1463c6479bf31bb7d20a1a1bb
-Size (seahorse-2.26.2.tar.bz2) = 2196810 bytes
-SHA1 (patch-aa) = c9a8ee51c038095ed32a07b78fe1b36f718830d2
-SHA1 (patch-ab) = 0abe419541669a41aaf48e3a41efdcfc031ed0ed
+SHA1 (seahorse-2.28.1.tar.bz2) = 8d849f9e95241be3eefb54f3b64a18017c7bb8fc
+RMD160 (seahorse-2.28.1.tar.bz2) = 40e33550233f81a7adf152d8ba72a095c3a822bd
+Size (seahorse-2.28.1.tar.bz2) = 2397687 bytes
+SHA1 (patch-ab) = 2c785a8088dec9786f6c9d9ebbdf7cc2102f609c
diff --git a/security/seahorse/patches/patch-aa b/security/seahorse/patches/patch-aa
deleted file mode 100644
index 48db6686167..00000000000
--- a/security/seahorse/patches/patch-aa
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2009/05/19 23:54:28 wiz Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=583281
-
---- configure.orig	2009-04-12 14:33:21.000000000 +0000
-+++ configure
-@@ -17853,7 +17853,7 @@ _ACEOF
- 
- fi
- 
-- if test "$enable_pgp" == "yes"; then
-+ if test "$enable_pgp" = "yes"; then
-   WITH_PGP_TRUE=
-   WITH_PGP_FALSE='#'
- else
-@@ -19016,7 +19016,7 @@ else
- $as_echo "yes" >&6; }
- 	enable_pkcs11="yes"
- fi
--	if test "$enable_pkcs11" == "yes"; then
-+	if test "$enable_pkcs11" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define WITH_PKCS11 1
-@@ -19027,7 +19027,7 @@ _ACEOF
- 	fi
- fi
- 
-- if test "$enable_pkcs11" == "yes"; then
-+ if test "$enable_pkcs11" = "yes"; then
-   WITH_PKCS11_TRUE=
-   WITH_PKCS11_FALSE='#'
- else
-@@ -19152,7 +19152,7 @@ _ACEOF
- 
- fi
- 
-- if test "$enable_ssh" == "yes"; then
-+ if test "$enable_ssh" = "yes"; then
-   WITH_SSH_TRUE=
-   WITH_SSH_FALSE='#'
- else
-@@ -19209,7 +19209,7 @@ if test "$enable_tests" != "yes"; then
-     enable_tests="no"
- fi
- 
-- if test "$enable_tests" == "yes"; then
-+ if test "$enable_tests" = "yes"; then
-   WITH_TESTS_TRUE=
-   WITH_TESTS_FALSE='#'
- else
diff --git a/security/seahorse/patches/patch-ab b/security/seahorse/patches/patch-ab
index 91df765ad3f..c59abd49c06 100644
--- a/security/seahorse/patches/patch-ab
+++ b/security/seahorse/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2009/03/15 18:32:44 jmcneill Exp $
+$NetBSD: patch-ab,v 1.11 2009/10/24 12:53:56 drochner Exp $
 
---- daemon/Makefile.in.orig	2009-03-15 14:18:18.000000000 -0400
+--- daemon/Makefile.in.orig	2009-10-18 01:15:31.000000000 +0200
 +++ daemon/Makefile.in
-@@ -323,7 +323,7 @@ INCLUDES = -I$(top_builddir) \
+@@ -336,7 +336,7 @@ INCLUDES = -I$(top_builddir) \
  	-DLOCALEDIR=\""$(localedir)"\" \
  	-DPIXMAPSDIR=\""$(pixmapsdir)"\" \
  	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
@@ -11,8 +11,8 @@ $NetBSD: patch-ab,v 1.10 2009/03/15 18:32:44 jmcneill Exp $
  
  BUILT_SOURCES = \
  	seahorse-service-bindings.h \
-@@ -359,7 +359,7 @@ man_MANS = seahorse-daemon.1
- glade_DATA = 
+@@ -371,7 +371,7 @@ seahorse_daemon_LDADD = \
+ man_MANS = seahorse-daemon.1
  
  #autostart
 -desktopdir = $(sysconfdir)/xdg/autostart