From 2150fd9023793a159658b6450a13c0ec7cb3290a Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Tue, 14 Jun 2011 21:56:13 +0000
Subject: [PATCH] Rework this patch.

---
 x11/gnome3/x11/gnome/system-monitor/Makefile  |  4 +--
 .../patches/patch-src_openfiles_cpp           | 28 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/x11/gnome3/x11/gnome/system-monitor/Makefile b/x11/gnome3/x11/gnome/system-monitor/Makefile
index 82e3dcb892f..3f516d635a2 100644
--- a/x11/gnome3/x11/gnome/system-monitor/Makefile
+++ b/x11/gnome3/x11/gnome/system-monitor/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2011/06/14 16:54:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2011/06/14 21:56:13 ajacoutot Exp $
 
 COMMENT=	sytem monitor for GNOME
 
 GNOME_PROJECT=	gnome-system-monitor
 GNOME_VERSION=	3.0.1
 
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	sysutils
 
diff --git a/x11/gnome3/x11/gnome/system-monitor/patches/patch-src_openfiles_cpp b/x11/gnome3/x11/gnome/system-monitor/patches/patch-src_openfiles_cpp
index 20f0973058e..629f39bf78d 100644
--- a/x11/gnome3/x11/gnome/system-monitor/patches/patch-src_openfiles_cpp
+++ b/x11/gnome3/x11/gnome/system-monitor/patches/patch-src_openfiles_cpp
@@ -1,15 +1,17 @@
-$OpenBSD: patch-src_openfiles_cpp,v 1.1.1.1 2011/06/07 13:31:39 jasper Exp $
---- src/openfiles.cpp.orig	Tue Jun 23 02:03:02 2009
-+++ src/openfiles.cpp	Thu Apr  8 18:08:11 2010
-@@ -67,7 +67,11 @@ friendlier_hostname(const char *addr_str, int port)
- 		goto failsafe;
+$OpenBSD: patch-src_openfiles_cpp,v 1.2 2011/06/14 21:56:13 ajacoutot Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=652602
+
+--- src/openfiles.cpp.orig	Fri Mar 25 01:39:45 2011
++++ src/openfiles.cpp	Tue Jun 14 23:44:01 2011
+@@ -15,6 +15,10 @@
+ #include "util.h"
+ #include "settings-keys.h"
  
- 	if (getnameinfo(res->ai_addr, res->ai_addrlen, hostname,
-+#ifdef NI_IDN
- 			sizeof hostname, service, sizeof service, NI_IDN))
-+#else
-+	    		sizeof hostname, service, sizeof service, 0))
++#ifndef NI_IDN
++#define NI_IDN 0
 +#endif
- 		goto failsafe;
- 
- 	if (res) freeaddrinfo(res);
++
+ enum
+ {
+ 	COL_FD,