update to 2.22.1

This switches to the gnome-2.22 release branch.

3 files changed, 13 insertions, 13 deletions

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