3 files changed, 75 insertions, 29 deletions

diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index cb99154810bc..aa8aed3101f5 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.95 2007/03/12 23:11:28 marcus Exp $
+#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.109 2007/10/15 21:02:38 mezz Exp $
 #
 
 PORTNAME=	gnome-system-monitor
-PORTVERSION=	2.18.2
+PORTVERSION=	2.20.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,7 +19,8 @@ COMMENT=	GNOME 2 system monitor program
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
-    		pcre.0:${PORTSDIR}/devel/pcre
+    		pcre.0:${PORTSDIR}/devel/pcre \
+		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
 USE_BZIP2=	yes
@@ -29,6 +30,7 @@ INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-pcrecpp
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lutil"
 
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 3ac932317156..e7cfef5ba41e 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.18.2.tar.bz2) = 860047e636522af2c068dddb5df883bd
-SHA256 (gnome2/gnome-system-monitor-2.18.2.tar.bz2) = 83d1da86d7ded5402418c8e5a06b1e9d1b35edcf9b83afb55fc40053bc15c632
-SIZE (gnome2/gnome-system-monitor-2.18.2.tar.bz2) = 1734003
+MD5 (gnome2/gnome-system-monitor-2.20.1.tar.bz2) = 51d501c06ad46a185e5c2bc35f88c0bb
+SHA256 (gnome2/gnome-system-monitor-2.20.1.tar.bz2) = 19304dfcd81bd4c66eefb6d19f28fcff032aeeaa4ddc69bc4e7c9c1b38509ed6
+SIZE (gnome2/gnome-system-monitor-2.20.1.tar.bz2) = 1825337
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index f9c1f0318722..f099100907d6 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -1,5 +1,5 @@
 bin/gnome-system-monitor
-share/gnome/applications/gnome-system-monitor.desktop
+share/applications/gnome-system-monitor.desktop
 share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
 share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
 share/gnome/help/gnome-system-monitor/C/figures/colorPanel.png
@@ -29,6 +29,20 @@ 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/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
@@ -57,6 +71,20 @@ 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
@@ -85,13 +113,6 @@ 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/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
-share/gnome/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
-share/gnome/omf/gnome-system-monitor/gnome-system-monitor-es.omf
-share/gnome/omf/gnome-system-monitor/gnome-system-monitor-fr.omf
-share/gnome/omf/gnome-system-monitor/gnome-system-monitor-pa.omf
-share/gnome/omf/gnome-system-monitor/gnome-system-monitor-sv.omf
-share/gnome/pixmaps/gnome-system-monitor/side.png
 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
@@ -141,6 +162,7 @@ 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
@@ -149,6 +171,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
@@ -156,6 +179,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
@@ -164,12 +188,46 @@ share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
 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
+@dirrm share/omf/gnome-system-monitor
+@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
+@dirrm share/gnome/help/gnome-system-monitor/C
+@dirrm share/gnome/help/gnome-system-monitor
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -180,18 +238,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrm share/gnome/pixmaps/gnome-system-monitor
-@dirrm share/gnome/omf/gnome-system-monitor
-@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/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/bg/figures
-@dirrm share/gnome/help/gnome-system-monitor/bg
-@dirrm share/gnome/help/gnome-system-monitor/C/figures
-@dirrm share/gnome/help/gnome-system-monitor/C
-@dirrm share/gnome/help/gnome-system-monitor
+@dirrmtry share/applications