Update to 2.5.1 with a plethora of changes. Looks like there's going to be

some shaking out of things for a while.


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

9 files changed, 55 insertions, 69 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index aa9d55037..f61778884 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgtop2
-PORTVERSION=	2.5.0
-PORTREVISION=	4
+PORTVERSION=	2.5.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index 00683e652..4cc46bc20 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1 +1,2 @@
-MD5 (gnome2/libgtop-2.5.0.tar.bz2) = 76c0a309157c08f2010c2f41e54b89a6
+MD5 (gnome2/libgtop-2.5.1.tar.bz2) = b419ebf3778ee0ef998f100eb8be8de8
+SIZE (gnome2/libgtop-2.5.1.tar.bz2) = 873450
diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop2/files/patch-configure
index 3bf337326..98b7832da 100644
--- a/devel/libgtop2/files/patch-configure
+++ b/devel/libgtop2/files/patch-configure
@@ -22,12 +22,3 @@
              echo "$as_me:$LINENO: result: $GLIB_LIBS" >&5
  echo "${ECHO_T}$GLIB_LIBS" >&6
          else
-@@ -18326,7 +18326,7 @@
- 
- 
- if test x$libgtop_need_server = xyes ; then
--   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la"
-+   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la \$(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la"
-    server_programs='libgtop_server2'
- else
-    sysdeps_suid_lib=
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::prockernel.c b/devel/libgtop2/files/patch-sysdeps::freebsd::prockernel.c
index 396ae9c8d..0e8850f65 100644
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::prockernel.c
+++ b/devel/libgtop2/files/patch-sysdeps::freebsd::prockernel.c
@@ -1,5 +1,5 @@
---- sysdeps/freebsd/prockernel.c.orig	Sun Oct 17 03:31:43 1999
-+++ sysdeps/freebsd/prockernel.c	Tue Sep  9 11:36:35 2003
+--- sysdeps/freebsd/prockernel.c.orig	Tue Oct 21 18:54:24 2003
++++ sysdeps/freebsd/prockernel.c	Sun Feb 15 15:34:42 2004
 @@ -34,12 +34,6 @@
  #if (!defined __OpenBSD__) && (!defined __bsdi__)
  #include <sys/user.h>
@@ -96,10 +96,10 @@
 -			 * leave them 0.
 -			 */
 -
--			buf->min_flt = (u_int64_t) pstats.p_ru.ru_minflt;
--			buf->maj_flt = (u_int64_t) pstats.p_ru.ru_majflt;
--			buf->cmin_flt = (u_int64_t) pstats.p_cru.ru_minflt;
--			buf->cmaj_flt = (u_int64_t) pstats.p_cru.ru_majflt;
+-			buf->min_flt = (guint64) pstats.p_ru.ru_minflt;
+-			buf->maj_flt = (guint64) pstats.p_ru.ru_majflt;
+-			buf->cmin_flt = (guint64) pstats.p_cru.ru_minflt;
+-			buf->cmaj_flt = (guint64) pstats.p_cru.ru_majflt;
 -			
 -			buf->flags |= _glibtop_sysdeps_proc_kernel_pstats;
 -		}
@@ -112,21 +112,21 @@
 -#ifdef __FreeBSD__
 -#ifndef __alpha__
 -#if (__FreeBSD_version >= 300003)
--			buf->kstk_esp = (u_int64_t) pcb.pcb_esp;
--			buf->kstk_eip = (u_int64_t) pcb.pcb_eip;
+-			buf->kstk_esp = (guint64) pcb.pcb_esp;
+-			buf->kstk_eip = (guint64) pcb.pcb_eip;
 -#else
--			buf->kstk_esp = (u_int64_t) pcb.pcb_ksp;
--			buf->kstk_eip = (u_int64_t) pcb.pcb_pc;
+-			buf->kstk_esp = (guint64) pcb.pcb_ksp;
+-			buf->kstk_eip = (guint64) pcb.pcb_pc;
 -#endif
 -#else
 -			/*xxx FreeBSD/Alpha? */
 -#endif
 -#else
--			buf->kstk_esp = (u_int64_t) pcb.pcb_tss.tss_esp0;
+-			buf->kstk_esp = (guint64) pcb.pcb_tss.tss_esp0;
 -#ifdef __bsdi__
--			buf->kstk_eip = (u_int64_t) pcb.pcb_tss.tss_eip;
+-			buf->kstk_eip = (guint64) pcb.pcb_tss.tss_eip;
 -#else
--			buf->kstk_eip = (u_int64_t) pcb.pcb_tss.__tss_eip;
+-			buf->kstk_eip = (guint64) pcb.pcb_tss.__tss_eip;
 -#endif
 -
 -			buf->flags |= _glibtop_sysdeps_proc_kernel_pcb;
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
index 83e508054..5cab09957 100644
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
+++ b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
@@ -1,5 +1,5 @@
---- sysdeps/freebsd/procmem.c.orig	Sun Oct 19 12:55:32 2003
-+++ sysdeps/freebsd/procmem.c	Sat Feb  7 22:48:12 2004
+--- sysdeps/freebsd/procmem.c.orig	Tue Oct 21 18:54:24 2003
++++ sysdeps/freebsd/procmem.c	Sun Feb 15 15:43:11 2004
 @@ -117,7 +117,7 @@
  #else
  	struct vm_object object;
@@ -9,45 +9,44 @@
  	int count;
  
  	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0);
-@@ -137,15 +137,29 @@
+@@ -136,16 +136,28 @@
+ 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
  		return;
  	}
++#if __FreeBSD_version >= 500013
  
 -	if (kvm_read (server->machine.kd,
 -		      (unsigned long) pinfo [0].kp_proc.p_limit,
 -		      (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) {
 -		glibtop_warn_io_r (server, "kvm_read (plimit)");
-+#if __FreeBSD_version >= 500013
-+
-+#define	XXX_P_VMSPACE	ki_vmspace
-+
++#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)
++	    	(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;
++	    	(pinfo [0].ki_rssize) << LOG1024;
 +
 +#else
 +
-+#define	XXX_P_VMSPACE	kp_proc.p_vmspace
++#define		XXX_P_VMSPACE	kp_proc.p_vmspace
 +
 +	if (getrlimit (RLIMIT_RSS, &rlimit) < 0) {
 +	    	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 @@
+@@ -154,11 +166,12 @@
  	
- 	buf->resident = buf->rss = (u_int64_t) pagetok
+ 	buf->resident = buf->rss = (guint64) pagetok
  		(vms->vm_rssize) << LOG1024;
 +#endif
  
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c b/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
index 8905fd21b..ab4c2b7af 100644
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
+++ b/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
@@ -1,5 +1,5 @@
---- sysdeps/freebsd/proctime.c.orig	Thu Feb 15 06:36:42 2001
-+++ sysdeps/freebsd/proctime.c	Tue Sep  9 11:17:56 2003
+--- sysdeps/freebsd/proctime.c.orig	Tue Oct 21 18:54:24 2003
++++ sysdeps/freebsd/proctime.c	Sun Feb 15 15:45:44 2004
 @@ -57,6 +57,7 @@
   * system, and interrupt time usage.
   */
@@ -24,7 +24,7 @@
  
 -#if (defined __FreeBSD__) && (__FreeBSD_version >= 300003)
 -
--	/* This was changed from a `struct timeval' into a `u_int64_t'
+-	/* This was changed from a `struct timeval' into a `guint64'
 -	 * on FreeBSD 3.0 and renamed p_rtime -> p_runtime.
 -	 */
 -
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::swap.c b/devel/libgtop2/files/patch-sysdeps::freebsd::swap.c
index e27ebad62..fcc281692 100644
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::swap.c
+++ b/devel/libgtop2/files/patch-sysdeps::freebsd::swap.c
@@ -1,5 +1,5 @@
---- sysdeps/freebsd/swap.c.orig	Tue Dec  2 14:57:38 2003
-+++ sysdeps/freebsd/swap.c	Tue Dec  2 15:05:38 2003
+--- sysdeps/freebsd/swap.c.orig	Tue Oct 21 18:54:25 2003
++++ sysdeps/freebsd/swap.c	Sun Feb 15 15:46:20 2004
 @@ -267,7 +267,7 @@
  	/* List of swap devices and sizes. */
  
@@ -9,17 +9,6 @@
  
  	if (kvm_read (server->machine.kd, ptr, sw, sw_size) != (ssize_t)sw_size) {
  		glibtop_warn_io_r (server, "kvm_read (*swdevt)");
-@@ -367,8 +367,8 @@
- 
- 	buf->flags = _glibtop_sysdeps_swap;
- 
--	buf->used = kvmsw[nswdev].ksw_used;
--	buf->total = kvmsw[nswdev].ksw_total;
-+	buf->used = kvmsw[nswdev].ksw_used * getpagesize ();
-+	buf->total = kvmsw[nswdev].ksw_total * getpagesize ();
- 
- 	buf->free = buf->total - buf->used;
- 
 @@ -399,7 +399,7 @@
  		return;
  	}
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
new file mode 100644
index 000000000..16bcbb055
--- /dev/null
+++ b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
@@ -0,0 +1,20 @@
+--- sysdeps/freebsd/Makefile.in.orig	Sun Feb 15 16:13:22 2004
++++ sysdeps/freebsd/Makefile.in	Sun Feb 15 16:16:05 2004
+@@ -138,7 +138,7 @@
+ 
+ noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
+ 
+-libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c
++libgtop_sysdeps_2_0_la_SOURCES = nosuid.c
+ 
+ libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
+ 
+@@ -172,7 +172,7 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ libgtop_sysdeps_2_0_la_LIBADD = 
+-libgtop_sysdeps_2_0_la_OBJECTS =  nosuid.lo siglist.lo
++libgtop_sysdeps_2_0_la_OBJECTS =  nosuid.lo
+ libgtop_sysdeps_suid_2_0_la_LIBADD = 
+ libgtop_sysdeps_suid_2_0_la_OBJECTS =  open.lo close.lo siglist.lo \
+ cpu.lo mem.lo swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo \
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index c111cd7fe..e7d4a4b74 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -46,21 +46,6 @@ include/libgtop-2.0/glibtop_suid.h
 lib/libgtop-2.0.a
 lib/libgtop-2.0.so
 lib/libgtop-2.0.so.2
-lib/libgtop_common-2.0.a
-lib/libgtop_common-2.0.so
-lib/libgtop_common-2.0.so.2
-lib/libgtop_names-2.0.a
-lib/libgtop_names-2.0.so
-lib/libgtop_names-2.0.so.2
-lib/libgtop_suid_common-2.0.a
-lib/libgtop_suid_common-2.0.so
-lib/libgtop_suid_common-2.0.so.2
-lib/libgtop_sysdeps-2.0.a
-lib/libgtop_sysdeps-2.0.so
-lib/libgtop_sysdeps-2.0.so.2
-lib/libgtop_sysdeps_suid-2.0.a
-lib/libgtop_sysdeps_suid-2.0.so
-lib/libgtop_sysdeps_suid-2.0.so.2
 libdata/pkgconfig/libgtop-2.0.pc
 share/locale/am/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
@@ -83,11 +68,13 @@ share/locale/ga/LC_MESSAGES/libgtop-2.0.mo
 share/locale/gl/LC_MESSAGES/libgtop-2.0.mo
 share/locale/he/LC_MESSAGES/libgtop-2.0.mo
 share/locale/hi/LC_MESSAGES/libgtop-2.0.mo
+share/locale/hr/LC_MESSAGES/libgtop-2.0.mo
 share/locale/hu/LC_MESSAGES/libgtop-2.0.mo
 share/locale/id/LC_MESSAGES/libgtop-2.0.mo
 share/locale/it/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ja/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ko/LC_MESSAGES/libgtop-2.0.mo
+share/locale/lt/LC_MESSAGES/libgtop-2.0.mo
 share/locale/lv/LC_MESSAGES/libgtop-2.0.mo
 share/locale/mk/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ml/LC_MESSAGES/libgtop-2.0.mo