Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release

ever.  It fixes many bugs, and adds some features missing in previous
FreeBSD ports.  To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:

http://www.freebsd.org/gnome/docs/faq26.html

Please read it carefully.  GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:

http://www.marcuscom.com/tinderbox/

The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts.  We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.

Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>

1 files changed, 9 insertions, 40 deletions

diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
index 83e5080548ab..e61274b13864 100644
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
+++ b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
@@ -1,6 +1,6 @@
---- sysdeps/freebsd/procmem.c.orig	Sun Oct 19 12:55:32 2003
-+++ sysdeps/freebsd/procmem.c	Sat Feb  7 22:48:12 2004
-@@ -117,7 +117,7 @@
+--- sysdeps/freebsd/procmem.c.orig	Wed Mar 10 21:23:52 2004
++++ sysdeps/freebsd/procmem.c	Thu Mar 11 15:46:05 2004
+@@ -125,7 +125,7 @@
  #else
  	struct vm_object object;
  #endif
@@ -9,53 +9,22 @@
  	int count;
  
  	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0);
-@@ -137,15 +137,29 @@
- 		return;
- 	}
+@@ -160,15 +160,12 @@
+ 
+ #define        PROC_VMSPACE   kp_proc.p_vmspace
  
 -	if (kvm_read (server->machine.kd,
--		      (unsigned long) pinfo [0].kp_proc.p_limit,
+-		      (unsigned long) pinfo [0].PROC_VMSPACE,
 -		      (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) {
 -		glibtop_warn_io_r (server, "kvm_read (plimit)");
-+#if __FreeBSD_version >= 500013
-+
-+#define	XXX_P_VMSPACE	ki_vmspace
-+
-+	buf->rss_rlim = pinfo [0].ki_rssize;
-+
-+	buf->vsize = (u_int64_t) pinfo [0].ki_size;
-+	buf->size = (u_int64_t) pagetok
-+		(pinfo [0].ki_tsize + pinfo [0].ki_dsize + pinfo[0].ki_ssize)
-+			<< LOG1024;
-+	buf->resident = buf->rss = (u_int64_t) pagetok
-+		(pinfo [0].ki_rssize) << LOG1024;
-+
-+#else
-+
-+#define	XXX_P_VMSPACE	kp_proc.p_vmspace
-+
 +	if (getrlimit (RLIMIT_RSS, &rlimit) < 0) {
-+	    	glibtop_warn_io_r (server, "getrlimit");
++		glibtop_warn_io_r (server, "getrlimit");
  		return;
  	}
  
--	buf->rss_rlim = (u_int64_t) 
+-	buf->rss_rlim = (guint64) 
 -		(plimit.pl_rlimit [RLIMIT_RSS].rlim_cur);
 +	buf->rss_rlim = (u_int64_t) (rlimit.rlim_cur);
  	
  	vms = &pinfo [0].kp_eproc.e_vm;
  
-@@ -154,11 +168,12 @@
- 	
- 	buf->resident = buf->rss = (u_int64_t) pagetok
- 		(vms->vm_rssize) << LOG1024;
-+#endif
- 
- 	/* Now we get the shared memory. */
- 
- 	if (kvm_read (server->machine.kd,
--		      (unsigned long) pinfo [0].kp_proc.p_vmspace,
-+		      (unsigned long) pinfo [0].XXX_P_VMSPACE,
- 		      (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace)) {
- 		glibtop_warn_io_r (server, "kvm_read (vmspace)");
- 		return;