Update to 3.2.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16383 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 77 insertions, 27 deletions

diff --git a/sysutils/gnome-system-monitor3/Makefile b/sysutils/gnome-system-monitor3/Makefile
index db80fa285..42e140a70 100644
--- a/sysutils/gnome-system-monitor3/Makefile
+++ b/sysutils/gnome-system-monitor3/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-monitor3/Makefile,v 1.8 2011/05/28 10:37:06 kwm Exp $
+#   $MCom: ports/sysutils/gnome-system-monitor3/Makefile,v 1.9 2011/06/10 22:59:09 mezz Exp $
 #
 
 PORTNAME=	gnome-system-monitor
-PORTVERSION=	3.0.1
+PORTVERSION=	3.2.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -23,16 +23,15 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc
 CONFLICTS=	gnome-system-monitor-2.[0-9]*
 
 LATEST_LINK=	gnome-system-monitor3
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libwnck3 gnomedocutils \
 		librsvg2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-#		LIBS="-L${LOCALBASE}/lib -lutil"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.gnome.gnome-system-monitor.enums.xml \
 		org.gnome.gnome-system-monitor.gschema.xml
diff --git a/sysutils/gnome-system-monitor3/distinfo b/sysutils/gnome-system-monitor3/distinfo
index eedb020ce..1e040080d 100644
--- a/sysutils/gnome-system-monitor3/distinfo
+++ b/sysutils/gnome-system-monitor3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-system-monitor-3.0.1.tar.bz2) = 0fe6a263875b23a35fd17d8952e666e17801cb68bb664d6ce8cabcfd9ac0f972
-SIZE (gnome3/gnome-system-monitor-3.0.1.tar.bz2) = 2552587
+SHA256 (gnome3/gnome-system-monitor-3.2.0.tar.xz) = 169c82bd1744adba1a4e3f384c06d9ff48aefac5d0f56e8ac4ad48b6f7f5810c
+SIZE (gnome3/gnome-system-monitor-3.2.0.tar.xz) = 2488920
diff --git a/sysutils/gnome-system-monitor3/files/patch-src_load-graph.cpp b/sysutils/gnome-system-monitor3/files/patch-src_load-graph.cpp
index 9b934be3d..125b6f474 100644
--- a/sysutils/gnome-system-monitor3/files/patch-src_load-graph.cpp
+++ b/sysutils/gnome-system-monitor3/files/patch-src_load-graph.cpp
@@ -1,11 +1,11 @@
---- src/load-graph.cpp.orig	2008-01-14 23:43:43.000000000 -0600
-+++ src/load-graph.cpp	2008-01-14 23:44:15.000000000 -0600
-@@ -412,7 +412,7 @@
- 	  // e.g: ceil(100.5 KiB) = 101 KiB = 101 * 2**(1 * 10)
- 	  //      where base10 = 1, coef10 = 101, pow2 = 16
+--- src/load-graph.cpp.orig	2011-08-30 02:46:08.000000000 +0200
++++ src/load-graph.cpp	2011-10-08 00:21:58.000000000 +0200
+@@ -415,7 +415,7 @@ net_scale (LoadGraph *graph, guint64 din
+         // e.g: ceil(100.5 KiB) = 101 KiB = 101 * 2**(1 * 10)
+         //      where base10 = 1, coef10 = 101, pow2 = 16
  
--	  unsigned pow2 = std::floor(log2(new_max));
-+	  unsigned pow2 = std::floor(log(new_max) / log(2));
- 	  unsigned base10 = pow2 / 10;
- 	  unsigned coef10 = std::ceil(new_max / double(1UL << (base10 * 10)));
- 	  g_assert(new_max <= (coef10 * (1UL << (base10 * 10))));
+-        guint64 pow2 = std::floor(log2(new_max));
++        guint64 pow2 = std::floor(log(new_max) / log (2));
+         guint64 base10 = pow2 / 10.0;
+         guint64 coef10 = std::ceil(new_max / double(G_GUINT64_CONSTANT(1) << (base10 * 10)));
+         g_assert(new_max <= (coef10 * (G_GUINT64_CONSTANT(1) << (base10 * 10))));
diff --git a/sysutils/gnome-system-monitor3/files/patch-src_openfiles.cpp b/sysutils/gnome-system-monitor3/files/patch-src_openfiles.cpp
index c00526174..7e97b8a49 100644
--- a/sysutils/gnome-system-monitor3/files/patch-src_openfiles.cpp
+++ b/sysutils/gnome-system-monitor3/files/patch-src_openfiles.cpp
@@ -1,14 +1,14 @@
---- src/openfiles.cpp.orig	2008-05-27 16:16:46.000000000 -0400
-+++ src/openfiles.cpp	2008-05-27 16:19:53.000000000 -0400
-@@ -66,7 +66,11 @@ friendlier_hostname(const char *addr_str
- 		goto failsafe;
+--- src/openfiles.cpp.orig	2011-08-30 02:46:08.000000000 +0200
++++ src/openfiles.cpp	2011-10-08 00:23:38.000000000 +0200
+@@ -71,7 +71,11 @@
+         goto failsafe;
  
- 	if (getnameinfo(res->ai_addr, res->ai_addrlen, hostname,
+     if (getnameinfo(res->ai_addr, res->ai_addrlen, hostname,
 +#ifdef NI_IDN
- 			sizeof hostname, service, sizeof service, NI_IDN))
+                     sizeof hostname, service, sizeof service, NI_IDN))
 +#else
-+	    		sizeof hostname, service, sizeof service, 0))
++                    sizeof hostname, service, sizeof service, 0))
 +#endif
- 		goto failsafe;
+         goto failsafe;
  
- 	if (res) freeaddrinfo(res);
+     if (res) freeaddrinfo(res);
diff --git a/sysutils/gnome-system-monitor3/pkg-plist b/sysutils/gnome-system-monitor3/pkg-plist
index 1e97fd5fb..1d0a35797 100644
--- a/sysutils/gnome-system-monitor3/pkg-plist
+++ b/sysutils/gnome-system-monitor3/pkg-plist
@@ -127,6 +127,20 @@ 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/eu/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/eu/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/eu/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/eu/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/eu/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/eu/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/eu/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/eu/figures/processListing.png
+share/gnome/help/gnome-system-monitor/eu/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/eu/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/eu/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/eu/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/eu/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/eu/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
@@ -141,6 +155,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/gl/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/gl/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/gl/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/gl/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/gl/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/gl/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/gl/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/gl/figures/processListing.png
+share/gnome/help/gnome-system-monitor/gl/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/gl/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/gl/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/gl/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/gl/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/gl/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
@@ -169,6 +197,20 @@ 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/ru/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/ru/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/ru/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/ru/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/ru/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/ru/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/ru/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/ru/figures/processListing.png
+share/gnome/help/gnome-system-monitor/ru/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/ru/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/ru/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/ru/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/ru/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/ru/gnome-system-monitor.xml
 share/gnome/help/gnome-system-monitor/sl/figures/addColumn.png
 share/gnome/help/gnome-system-monitor/sl/figures/changePriority.png
 share/gnome/help/gnome-system-monitor/sl/figures/colorPanel.png
@@ -305,9 +347,12 @@ share/omf/gnome-system-monitor/gnome-system-monitor-da.omf
 share/omf/gnome-system-monitor/gnome-system-monitor-de.omf
 share/omf/gnome-system-monitor/gnome-system-monitor-el.omf
 share/omf/gnome-system-monitor/gnome-system-monitor-es.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-eu.omf
 share/omf/gnome-system-monitor/gnome-system-monitor-fr.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-gl.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-ru.omf
 share/omf/gnome-system-monitor/gnome-system-monitor-sl.omf
 share/omf/gnome-system-monitor/gnome-system-monitor-sv.omf
 share/omf/gnome-system-monitor/gnome-system-monitor-zh_CN.omf
@@ -322,12 +367,18 @@ share/pixmaps/gnome-system-monitor/upload.svg
 @dirrm share/gnome/help/gnome-system-monitor/sv
 @dirrm share/gnome/help/gnome-system-monitor/sl/figures
 @dirrm share/gnome/help/gnome-system-monitor/sl
+@dirrm share/gnome/help/gnome-system-monitor/ru/figures
+@dirrm share/gnome/help/gnome-system-monitor/ru
 @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/gl/figures
+@dirrm share/gnome/help/gnome-system-monitor/gl
 @dirrm share/gnome/help/gnome-system-monitor/fr/figures
 @dirrm share/gnome/help/gnome-system-monitor/fr
+@dirrm share/gnome/help/gnome-system-monitor/eu/figures
+@dirrm share/gnome/help/gnome-system-monitor/eu
 @dirrm share/gnome/help/gnome-system-monitor/es/figures
 @dirrm share/gnome/help/gnome-system-monitor/es
 @dirrm share/gnome/help/gnome-system-monitor/el/figures