update to 2.20.1

This switches to the new gnome-2.20 branch.

4 files changed, 170 insertions, 12 deletions

diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 7a21ee88a08..3bf063775cf 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:18 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/11/05 19:09:07 drochner Exp $
 #
 
-DISTNAME=	gnome-system-monitor-2.15.92
-PKGREVISION=	6
+DISTNAME=	gnome-system-monitor-2.20.1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.15/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -16,6 +15,7 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		autoconf gmake intltool msgfmt pkg-config
+USE_LANGUAGES=		c c++
 
 CONFLICTS+=		gnome2-system-monitor-[0-9]*
 
@@ -28,20 +28,22 @@ pre-configure:
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.9.1
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
+BUILDLINK_API_DEPENDS.libgtop+=	libgtop>=2.19.3
 
 # TODO: Add libgksu support.
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../sysutils/libgtop/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
-
+.include "../../x11/gtkmm/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-system-monitor/PLIST b/sysutils/gnome-system-monitor/PLIST
index 205f2aa8e33..ee9b9aabd2f 100644
--- a/sysutils/gnome-system-monitor/PLIST
+++ b/sysutils/gnome-system-monitor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/09/25 10:54:18 hira Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/11/05 19:09:07 drochner Exp $
 bin/gnome-system-monitor
 share/applications/gnome-system-monitor.desktop
 share/gconf/schemas/gnome-system-monitor.schemas
@@ -31,7 +31,90 @@ share/gnome/help/gnome-system-monitor/bg/figures/sortMenu2.png
 share/gnome/help/gnome-system-monitor/bg/figures/systemMonitor.png
 share/gnome/help/gnome-system-monitor/bg/figures/viewMenu.png
 share/gnome/help/gnome-system-monitor/bg/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/bg/legal.xml
+share/gnome/help/gnome-system-monitor/ca/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/ca/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/ca/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/ca/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/ca/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/ca/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/ca/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/ca/figures/processListing.png
+share/gnome/help/gnome-system-monitor/ca/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/ca/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/ca/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/ca/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/ca/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/ca/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/es/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/es/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/es/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/es/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/es/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/es/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/es/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/es/figures/processListing.png
+share/gnome/help/gnome-system-monitor/es/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/es/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/es/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/es/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/es/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/es/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/fr/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/fr/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/fr/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/fr/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/fr/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/fr/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/fr/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/fr/figures/processListing.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/fr/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/fr/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/fr/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/oc/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/oc/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/oc/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/oc/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/oc/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/oc/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/oc/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/oc/figures/processListing.png
+share/gnome/help/gnome-system-monitor/oc/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/oc/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/oc/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/oc/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/oc/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/oc/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/pa/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/pa/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/pa/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/pa/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/pa/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/pa/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/pa/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/pa/figures/processListing.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/pa/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/pa/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/pa/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/sv/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/sv/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/sv/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/sv/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/sv/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/sv/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/sv/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/sv/figures/processListing.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/sv/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/sv/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/sv/gnome-system-monitor.xml
 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
@@ -75,11 +158,13 @@ share/locale/mg/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ne/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/oc/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/or/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo
@@ -88,6 +173,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/rw/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/si/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
@@ -95,6 +181,7 @@ share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/te/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/th/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ug/LC_MESSAGES/gnome-system-monitor.mo
@@ -105,8 +192,29 @@ share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
 share/omf/gnome-system-monitor/gnome-system-monitor-C.omf
 share/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-ca.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-es.omf
+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/side.png
+@dirrm share/pixmaps/gnome-system-monitor
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gnome-system-monitor
 @comment in scrollkeeper: @dirrm share/omf
+@dirrm share/gnome/help/gnome-system-monitor/sv/figures
+@dirrm share/gnome/help/gnome-system-monitor/sv
+@dirrm share/gnome/help/gnome-system-monitor/pa/figures
+@dirrm share/gnome/help/gnome-system-monitor/pa
+@dirrm share/gnome/help/gnome-system-monitor/oc/figures
+@dirrm share/gnome/help/gnome-system-monitor/oc
+@dirrm share/gnome/help/gnome-system-monitor/fr/figures
+@dirrm share/gnome/help/gnome-system-monitor/fr
+@dirrm share/gnome/help/gnome-system-monitor/es/figures
+@dirrm share/gnome/help/gnome-system-monitor/es
+@dirrm share/gnome/help/gnome-system-monitor/ca/figures
+@dirrm share/gnome/help/gnome-system-monitor/ca
 @dirrm share/gnome/help/gnome-system-monitor/bg/figures
 @dirrm share/gnome/help/gnome-system-monitor/bg
 @dirrm share/gnome/help/gnome-system-monitor/C/figures
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 800ef9ce665..568ca6fb1ac 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2007/09/20 00:08:10 wiz Exp $
+$NetBSD: distinfo,v 1.2 2007/11/05 19:09:07 drochner Exp $
 
-SHA1 (gnome-system-monitor-2.15.92.tar.bz2) = f158b43d4365b8605a4ee0f822dd4d977c6dfff9
-RMD160 (gnome-system-monitor-2.15.92.tar.bz2) = c0bf2c5356a0626071663ad43cd2019a4f7c16af
-Size (gnome-system-monitor-2.15.92.tar.bz2) = 1514372 bytes
+SHA1 (gnome-system-monitor-2.20.1.tar.bz2) = d14ca0b41d95bd533b875c58152cb9dddfbee631
+RMD160 (gnome-system-monitor-2.20.1.tar.bz2) = 78f31e78eaf20ac098970a2cc87e0b68d9eed851
+Size (gnome-system-monitor-2.20.1.tar.bz2) = 1825337 bytes
+SHA1 (patch-aa) = 76c5d94f36fd3c29e8c3cabc77925e93851465b9
diff --git a/sysutils/gnome-system-monitor/patches/patch-aa b/sysutils/gnome-system-monitor/patches/patch-aa
new file mode 100644
index 00000000000..53daf448b79
--- /dev/null
+++ b/sysutils/gnome-system-monitor/patches/patch-aa
@@ -0,0 +1,47 @@
+$NetBSD: patch-aa,v 1.1 2007/11/05 19:09:08 drochner Exp $
+
+--- src/sysinfo.cpp.orig	2007-11-04 21:12:42.000000000 +0100
++++ src/sysinfo.cpp
+@@ -190,6 +190,26 @@ namespace {
+     }
+   };
+ 
++  class NetBSDSysInfo
++    : public SysInfo
++  {
++  public:
++    NetBSDSysInfo()
++    {
++      this->load_netbsd_info();
++    }
++
++  private:
++    void load_netbsd_info()
++    {
++      this->distro_name = "NetBSD";
++
++      std::ifstream input("/etc/release");
++
++      if (input)
++	std::getline(input, this->distro_release);
++    }
++  };
+ 
+   class LSBSysInfo
+     : public SysInfo
+@@ -256,10 +276,15 @@ namespace {
+       g_free(p);
+       return new LSBSysInfo;
+     }
++#ifdef __NetBSD__ /* might also have /etc/release */
++    else
++      return new NetBSDSysInfo;
++#else
+     else if (g_file_test("/etc/release", G_FILE_TEST_EXISTS))
+       return new SolarisSysInfo;
+ 
+     return new SysInfo;
++#endif
+   }
+ }
+