update to 2.22.1

This switches to the gnome-2.22 release branch.

9 files changed, 57 insertions, 39 deletions

diff --git a/security/seahorse-gedit/Makefile b/security/seahorse-gedit/Makefile
index c70b7193e51..b5c92ad6a86 100644
--- a/security/seahorse-gedit/Makefile
+++ b/security/seahorse-gedit/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/15 18:53:42 drochner Exp $
 
-DISTNAME=	seahorse-2.20.3
-PKGNAME=	seahorse-gedit-2.20.3
-PKGREVISION=	2
+DISTNAME=	seahorse-2.22.1
+PKGNAME=	seahorse-gedit-2.22.1
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -37,7 +36,7 @@ INSTALL_DIRS=	plugins/gedit
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../net/libsoup-devel/buildlink3.mk"
+.include "../../net/libsoup24/buildlink3.mk"
 .include "../../security/seahorse/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
diff --git a/security/seahorse-nautilus/Makefile b/security/seahorse-nautilus/Makefile
index 3aeb0e9b085..a2c148a927f 100644
--- a/security/seahorse-nautilus/Makefile
+++ b/security/seahorse-nautilus/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2008/04/15 18:53:42 drochner Exp $
 
-DISTNAME=	seahorse-2.20.3
-PKGNAME=	seahorse-nautilus-2.20.3
-PKGREVISION=	2
+DISTNAME=	seahorse-2.22.1
+PKGNAME=	seahorse-nautilus-2.22.1
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -32,7 +31,7 @@ INSTALL_DIRS=	plugins/nautilus-ext
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../net/libsoup-devel/buildlink3.mk"
+.include "../../net/libsoup24/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/security/seahorse-nautilus/PLIST b/security/seahorse-nautilus/PLIST
index fae5faa97f8..eac29815996 100644
--- a/security/seahorse-nautilus/PLIST
+++ b/security/seahorse-nautilus/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/14 15:02:38 drochner Exp $
-lib/nautilus/extensions-1.0/libnautilus-seahorse.la
-@comment in nautilus: @dirrm lib/nautilus/extensions-1.0
+@comment $NetBSD: PLIST,v 1.2 2008/04/15 18:53:42 drochner Exp $
+lib/nautilus/extensions-2.0/libnautilus-seahorse.la
+@comment in nautilus: @dirrm lib/nautilus/extensions-2.0
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 9008bbc6a23..04f08fa4644 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2008/04/15 18:53:42 drochner Exp $
 
-DISTNAME=	seahorse-2.20.3
-PKGREVISION=	1
+DISTNAME=	seahorse-2.22.1
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -45,7 +44,7 @@ BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../net/libsoup-devel/buildlink3.mk"
+.include "../../net/libsoup24/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/security/seahorse/PLIST b/security/seahorse/PLIST
index 59cd61c65a3..bbf05532fe2 100644
--- a/security/seahorse/PLIST
+++ b/security/seahorse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2007/11/05 19:49:04 drochner Exp $
+@comment $NetBSD: PLIST,v 1.18 2008/04/15 18:53:42 drochner Exp $
 bin/seahorse
 bin/seahorse-agent
 bin/seahorse-daemon
@@ -103,6 +103,19 @@ share/gnome/help/seahorse/oc/figures/seahorse-window.png
 share/gnome/help/seahorse/oc/figures/signature.png
 share/gnome/help/seahorse/oc/figures/text-editor.png
 share/gnome/help/seahorse/oc/seahorse.xml
+share/gnome/help/seahorse/ru/figures/export.png
+share/gnome/help/seahorse/ru/figures/file-manager.png
+share/gnome/help/seahorse/ru/figures/generate.png
+share/gnome/help/seahorse/ru/figures/import.png
+share/gnome/help/seahorse/ru/figures/key-manager.png
+share/gnome/help/seahorse/ru/figures/key-properties.png
+share/gnome/help/seahorse/ru/figures/passphrase.png
+share/gnome/help/seahorse/ru/figures/preferences.png
+share/gnome/help/seahorse/ru/figures/recipients.png
+share/gnome/help/seahorse/ru/figures/seahorse-window.png
+share/gnome/help/seahorse/ru/figures/signature.png
+share/gnome/help/seahorse/ru/figures/text-editor.png
+share/gnome/help/seahorse/ru/seahorse.xml
 share/gnome/help/seahorse/sv/figures/export.png
 share/gnome/help/seahorse/sv/figures/file-manager.png
 share/gnome/help/seahorse/sv/figures/generate.png
@@ -156,6 +169,7 @@ share/locale/et/LC_MESSAGES/seahorse.mo
 share/locale/eu/LC_MESSAGES/seahorse.mo
 share/locale/fi/LC_MESSAGES/seahorse.mo
 share/locale/fr/LC_MESSAGES/seahorse.mo
+share/locale/ga/LC_MESSAGES/seahorse.mo
 share/locale/gl/LC_MESSAGES/seahorse.mo
 share/locale/gu/LC_MESSAGES/seahorse.mo
 share/locale/he/LC_MESSAGES/seahorse.mo
@@ -164,15 +178,18 @@ share/locale/hr/LC_MESSAGES/seahorse.mo
 share/locale/hu/LC_MESSAGES/seahorse.mo
 share/locale/it/LC_MESSAGES/seahorse.mo
 share/locale/ja/LC_MESSAGES/seahorse.mo
+share/locale/kn/LC_MESSAGES/seahorse.mo
 share/locale/ko/LC_MESSAGES/seahorse.mo
 share/locale/lt/LC_MESSAGES/seahorse.mo
 share/locale/lv/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
 share/locale/ms/LC_MESSAGES/seahorse.mo
 share/locale/nb/LC_MESSAGES/seahorse.mo
 share/locale/ne/LC_MESSAGES/seahorse.mo
 share/locale/nl/LC_MESSAGES/seahorse.mo
+share/locale/nn/LC_MESSAGES/seahorse.mo
 share/locale/oc/LC_MESSAGES/seahorse.mo
 share/locale/or/LC_MESSAGES/seahorse.mo
 share/locale/pa/LC_MESSAGES/seahorse.mo
@@ -204,6 +221,7 @@ share/omf/seahorse/seahorse-es.omf
 share/omf/seahorse/seahorse-fr.omf
 share/omf/seahorse/seahorse-it.omf
 share/omf/seahorse/seahorse-oc.omf
+share/omf/seahorse/seahorse-ru.omf
 share/omf/seahorse/seahorse-sv.omf
 share/omf/seahorse/seahorse-vi.omf
 share/pixmaps/seahorse-applet.svg
@@ -258,6 +276,7 @@ share/pixmaps/seahorse/scalable/seahorse-sign-ok.svg
 share/pixmaps/seahorse/scalable/seahorse-sign-unknown.svg
 share/pixmaps/seahorse/scalable/seahorse-sign.svg
 share/pixmaps/seahorse/scalable/seahorse.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
@@ -293,7 +312,7 @@ share/seahorse/glade/seahorse-ssh-upload.glade
 @dirrm share/pixmaps/seahorse
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/seahorse
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @comment in shared-mime-info: @dirrm share/mime/packages
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
@@ -303,6 +322,8 @@ share/seahorse/glade/seahorse-ssh-upload.glade
 @dirrm share/gnome/help/seahorse/vi
 @dirrm share/gnome/help/seahorse/sv/figures
 @dirrm share/gnome/help/seahorse/sv
+@dirrm share/gnome/help/seahorse/ru/figures
+@dirrm share/gnome/help/seahorse/ru
 @dirrm share/gnome/help/seahorse/oc/figures
 @dirrm share/gnome/help/seahorse/oc
 @dirrm share/gnome/help/seahorse/it/figures
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 4e80e7eab24..5f45e36f3cf 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2008/01/11 13:56:56 drochner Exp $
+$NetBSD: distinfo,v 1.23 2008/04/15 18:53:42 drochner Exp $
 
-SHA1 (seahorse-2.20.3.tar.bz2) = 1946c0b6ff6f1dcd2c7d95e446d620592b129d32
-RMD160 (seahorse-2.20.3.tar.bz2) = e19c4d51b09511b570e90aa37a5b437a95a7404f
-Size (seahorse-2.20.3.tar.bz2) = 2273106 bytes
+SHA1 (seahorse-2.22.1.tar.bz2) = c6a96ac670540522c6ec0d6a3871a6ed711fb082
+RMD160 (seahorse-2.22.1.tar.bz2) = be97418841c14ef132af650e81c41032c7b15b52
+Size (seahorse-2.22.1.tar.bz2) = 2195121 bytes
 SHA1 (patch-aa) = 991e7eb505efa2b81a6f56910aa9359743e1cb3b
 SHA1 (patch-ab) = c069dcda73f0ade281d2a847b8aee2ed3d945a3c
 SHA1 (patch-ac) = 0ad2021c9bda727b3b219cd6d6ca0a6132cc0a37
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 36843175937..b494c50868b 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/15 18:55:56 drochner Exp $
 #
 
-DISTNAME=	gnome-system-monitor-2.20.2
-PKGREVISION=	1
+DISTNAME=	gnome-system-monitor-2.22.1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -23,10 +22,6 @@ CONFLICTS+=		gnome2-system-monitor-[0-9]*
 LIBS+=			-lutil
 GCONF_SCHEMAS+=	gnome-system-monitor.schemas
 
-pre-configure:
-	cd ${WRKSRC} && ${PREFIX}/bin/libtoolize
-	cd ${WRKSRC} && autoconf
-
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.9.1
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
 BUILDLINK_API_DEPENDS.libgtop+=	libgtop>=2.19.3
@@ -38,6 +33,7 @@ BUILDLINK_API_DEPENDS.libgtop+=	libgtop>=2.19.3
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../sysutils/libgtop/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/sysutils/gnome-system-monitor/PLIST b/sysutils/gnome-system-monitor/PLIST
index ee9b9aabd2f..27a9f04e154 100644
--- a/sysutils/gnome-system-monitor/PLIST
+++ b/sysutils/gnome-system-monitor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/11/05 19:09:07 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/04/15 18:55:56 drochner Exp $
 bin/gnome-system-monitor
 share/applications/gnome-system-monitor.desktop
 share/gconf/schemas/gnome-system-monitor.schemas
@@ -119,6 +119,7 @@ share/locale/am/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/be/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/be@latin/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-system-monitor.mo
@@ -149,6 +150,7 @@ share/locale/id/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/it/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ka/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/kn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ku/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/li/LC_MESSAGES/gnome-system-monitor.mo
@@ -198,7 +200,9 @@ share/omf/gnome-system-monitor/gnome-system-monitor-fr.omf
 share/omf/gnome-system-monitor/gnome-system-monitor-oc.omf
 share/omf/gnome-system-monitor/gnome-system-monitor-pa.omf
 share/omf/gnome-system-monitor/gnome-system-monitor-sv.omf
+share/pixmaps/gnome-system-monitor/download.svg
 share/pixmaps/gnome-system-monitor/side.png
+share/pixmaps/gnome-system-monitor/upload.svg
 @dirrm share/pixmaps/gnome-system-monitor
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gnome-system-monitor
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 9dfc31de846..12f028d4451 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/01/11 14:01:19 drochner Exp $
+$NetBSD: distinfo,v 1.4 2008/04/15 18:55:56 drochner Exp $
 
-SHA1 (gnome-system-monitor-2.20.2.tar.bz2) = 74de14563fa4ceabfd2aec03774fbfc5bfc6dfa0
-RMD160 (gnome-system-monitor-2.20.2.tar.bz2) = cb940d9994a9056909c40a722997e77dcc16db61
-Size (gnome-system-monitor-2.20.2.tar.bz2) = 1827859 bytes
+SHA1 (gnome-system-monitor-2.22.1.tar.bz2) = eb6dec6abb7af398bb91b4b41de2570c3c6c1236
+RMD160 (gnome-system-monitor-2.22.1.tar.bz2) = 070fe33d9109b1a5de1698f8f8683ff0be1f6a31
+Size (gnome-system-monitor-2.22.1.tar.bz2) = 1936032 bytes
 SHA1 (patch-aa) = 76c5d94f36fd3c29e8c3cabc77925e93851465b9