Update to 2.14.1.

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

10 files changed, 71 insertions, 170 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index ebae58621..fdb427a30 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgtop2/Makefile,v 1.66 2006/03/13 20:50:55 marcus Exp $
+#   $MCom: ports/devel/libgtop2/Makefile,v 1.67 2006/03/14 07:26:28 marcus Exp $
 #
 
 PORTNAME=	libgtop2
-PORTVERSION=	2.14.0
-PORTREVISION=	1
+PORTVERSION=	2.14.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index f936b93e8..dd81ddab3 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgtop-2.14.0.tar.bz2) = bc7360262d1c195ba4e7e373843a8c6d
-SHA256 (gnome2/libgtop-2.14.0.tar.bz2) = 6af16f63b2aed7c06cd3047f5acb00812f964ccfde5bd073f7a32d28c2488b9a
-SIZE (gnome2/libgtop-2.14.0.tar.bz2) = 659522
+MD5 (gnome2/libgtop-2.14.1.tar.bz2) = 59cc661ae518fcae158517cc029b2add
+SHA256 (gnome2/libgtop-2.14.1.tar.bz2) = b0658ab0327bf833295bb8d2467ab16747c017c8cd26ff6936a927def6818fb2
+SIZE (gnome2/libgtop-2.14.1.tar.bz2) = 661846
diff --git a/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in
index fc8c213bf..1258d576f 100644
--- a/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in
+++ b/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in
@@ -1,38 +1,20 @@
---- sysdeps/freebsd/Makefile.in.orig	Thu Dec 15 02:19:13 2005
-+++ sysdeps/freebsd/Makefile.in	Thu Dec 15 02:22:49 2005
-@@ -50,15 +50,15 @@
+--- sysdeps/freebsd/Makefile.in.orig	Mon Apr 10 14:08:39 2006
++++ sysdeps/freebsd/Makefile.in	Mon Apr 10 14:11:50 2006
+@@ -50,7 +50,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
 -libgtop_sysdeps_2_0_la_LIBADD =
 +libgtop_sysdeps_2_0_la_LIBADD = -lgeom -ldevstat
- am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo
+ am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo
  libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS)
--libgtop_sysdeps_suid_2_0_la_LIBADD =
-+libgtop_sysdeps_suid_2_0_la_LIBADD = -lgeom -ldevstat
- am_libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo \
- 	mem.lo swap.lo uptime.lo loadavg.lo shm_limits.lo \
- 	msg_limits.lo sem_limits.lo proclist.lo procstate.lo \
- 	procuid.lo proctime.lo procmem.lo procsignal.lo prockernel.lo \
--	procsegment.lo procargs.lo procmap.lo netlist.lo netload.lo \
-+	procsegment.lo procargs.lo procmap.lo sysinfo.lo netlist.lo netload.lo \
- 	ppp.lo procopenfiles.lo fsusage.lo
- libgtop_sysdeps_suid_2_0_la_OBJECTS =  \
- 	$(am_libgtop_sysdeps_suid_2_0_la_OBJECTS)
-@@ -263,7 +263,7 @@
+ am__DEPENDENCIES_1 =
+@@ -260,7 +260,7 @@ target_vendor = @target_vendor@
+ noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
+ libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c sysinfo.c
+ libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
+-libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS)
++libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) -lgeom -ldevstat
+ libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \
+ 				  uptime.c loadavg.c shm_limits.c msg_limits.c \
  				  sem_limits.c proclist.c procstate.c procuid.c \
- 				  proctime.c procmem.c procsignal.c prockernel.c \
- 				  procsegment.c procargs.c procmap.c netlist.c \
--				  netload.c ppp.c procopenfiles.c fsusage.c
-+				  netload.c ppp.c procopenfiles.c sysinfo.c fsusage.c
- 
- libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
- libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h \
-@@ -330,6 +330,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msg_limits.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysinfo.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nosuid.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@
diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop2/files/patch-configure
index 9f34c540f..934f89e79 100644
--- a/devel/libgtop2/files/patch-configure
+++ b/devel/libgtop2/files/patch-configure
@@ -1,6 +1,14 @@
---- configure.orig	Wed Dec 14 19:02:10 2005
-+++ configure	Wed Dec 14 19:04:36 2005
-@@ -24474,7 +24474,7 @@
+--- configure.orig	Mon Apr 10 15:28:24 2006
++++ configure	Mon Apr 10 15:30:40 2006
+@@ -20568,6 +20568,7 @@ else
+ 	    for def in nothing KERNEL _KERNEL; do
+ 	      cat >conftest.$ac_ext <<_ACEOF
+ #define $def
++#include <sys/types.h>
+ #include <sys/ipc.h>
+ #include <sys/msg.h>
+ #include <stdio.h>
+@@ -23458,7 +23459,7 @@ fi
  
  
  case "$host_os" in
diff --git a/devel/libgtop2/files/patch-lib::read.c b/devel/libgtop2/files/patch-lib::read.c
index b4ca49534..18c837d37 100644
--- a/devel/libgtop2/files/patch-lib::read.c
+++ b/devel/libgtop2/files/patch-lib::read.c
@@ -1,5 +1,5 @@
---- lib/read.c.orig	Mon Apr 11 03:25:32 2005
-+++ lib/read.c	Mon Apr 11 03:27:06 2005
+--- lib/read.c.orig	Mon Apr 10 04:41:46 2006
++++ lib/read.c	Mon Apr 10 15:12:31 2006
 @@ -22,6 +22,7 @@
  */
  
@@ -7,9 +7,9 @@
 +#include <errno.h>
  #include <glibtop/read.h>
  #include <glibtop/error.h>
- #include "libgtop-i18n.h"
-@@ -56,14 +57,18 @@
- 	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size);
+ #include <glib/gi18n-lib.h>
+@@ -56,14 +57,18 @@ glibtop_read_l (glibtop *server, size_t 
+ 	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", (int)size);
  #endif
  
 +retry:
@@ -24,7 +24,7 @@
  				server,
  				ngettext ("read %d byte",
  					  "read %d bytes", size),
- 				size);
+ 				(int)size);
 +		}
  	}
  }
diff --git a/devel/libgtop2/files/patch-lib::write.c b/devel/libgtop2/files/patch-lib::write.c
index 0d00f7a5f..acb63c489 100644
--- a/devel/libgtop2/files/patch-lib::write.c
+++ b/devel/libgtop2/files/patch-lib::write.c
@@ -1,5 +1,5 @@
---- lib/write.c.orig	Mon Apr 11 03:28:12 2005
-+++ lib/write.c	Mon Apr 11 03:29:00 2005
+--- lib/write.c.orig	Mon Apr 10 04:41:46 2006
++++ lib/write.c	Mon Apr 10 15:37:00 2006
 @@ -22,7 +22,7 @@
  */
  
@@ -8,9 +8,9 @@
 +#include <errno.h>
  #include <glibtop/write.h>
  #include <glibtop/error.h>
- #include "libgtop-i18n.h"
-@@ -42,12 +42,16 @@
- 	fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size);
+ #include <glib/gi18n-lib.h>
+@@ -42,15 +42,19 @@ glibtop_write_l (glibtop *server, size_t
+ 	fprintf (stderr, "LIBRARY: really writing %d bytes.\n", (int)size);
  #endif
  
 +retry:
@@ -24,6 +24,9 @@
 +	if (ret < 0) {
 +		if (errno == EINTR)
 +			goto retry;
- 		glibtop_error_io_r (server, ngettext ("wrote %d byte", "wrote %d bytes", size), size);
+ 		glibtop_error_io_r (server,
+ 				    ngettext("wrote %d byte",
+ 					     "wrote %d bytes", size),
+ 				    (int) size);
 +	}
  }
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c b/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c
index 128eda35b..85c9822f8 100644
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c
+++ b/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c
@@ -1,21 +1,28 @@
---- sysdeps/freebsd/fsusage.c.orig	Mon Feb 28 03:54:41 2005
-+++ sysdeps/freebsd/fsusage.c	Tue May 24 01:49:42 2005
-@@ -9,6 +9,12 @@
+--- sysdeps/freebsd/jfsusage.c.orig	Sun Apr  9 12:52:45 2006
++++ sysdeps/freebsd/fsusage.c	Mon Apr 10 15:34:42 2006
+@@ -9,10 +9,12 @@
+ 
  #include <unistd.h>
  #include <sys/param.h>
+-#if defined (HAVE_SYS_STATVFS_H)
+-#include <sys/statvfs.h>
+-#else
  #include <sys/mount.h>
 +#if __FreeBSD_version >= 600000
 +#include <libgeom.h>
 +#include <sys/resource.h>
 +#include <devstat.h>
 +#include <sys/devicestat.h>
-+#endif
+ #endif
  
  #include <stdio.h>
- #include <string.h>
-@@ -27,15 +33,107 @@ _glibtop_freebsd_get_fsusage_read_write(
+@@ -31,24 +33,108 @@ _glibtop_freebsd_get_fsusage_read_write(
+ 				      const char *path)
  {
  	int result;
+-#if defined (STAT_STATVFS)
+-	struct statvfs sfs;
+-#else
  	struct statfs sfs;
 +#if __FreeBSD_version >= 600000
 +	struct devstat *ds;
@@ -26,14 +33,18 @@
 +	struct gmesh gmp;
 +	double etime;
 +	uint64_t ld[2];
-+#endif
+ #endif
  
+-#if defined (STAT_STATVFS)
+-	result = statvfs (path, &sfs);
+-#else
  	result = statfs (path, &sfs);
+-#endif
  
  	if (result == -1) {
 +		glibtop_warn_io_r (server, "statfs");
- 		return;
- 	}
++		return;
++	}
 +#if __FreeBSD_version >= 600000
 +	ld[0] = 0;
 +	ld[1] = 0;
@@ -55,9 +66,9 @@
 +		glibtop_warn_io_r (server, "geom_stats_snapshot_get()");
 +		geom_stats_close ();
 +		geom_deletetree (&gmp);
-+		return;
-+	}
-+
+ 		return;
+ 	}
+ 
 +	geom_stats_snapshot_timestamp (sc, &ts);
 +	etime = ts.tv_sec + (ts.tv_nsec * 1e-9);
 +	geom_stats_snapshot_reset (sc);
@@ -107,7 +118,7 @@
 +			break;
 +		}
 +	}
- 
++ 
 +	geom_stats_snapshot_free (sc);
 +	geom_stats_close ();
 +	geom_deletetree (&gmp);
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h b/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h
index 5ded2dc3c..4955aed65 100644
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h
+++ b/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h
@@ -1,5 +1,5 @@
---- sysdeps/freebsd/glibtop_server.h.orig	Mon Oct 20 11:19:49 2003
-+++ sysdeps/freebsd/glibtop_server.h	Mon Aug  8 15:10:14 2005
+--- sysdeps/freebsd/glibtop_server.h.orig	Tue Apr  4 16:06:13 2006
++++ sysdeps/freebsd/glibtop_server.h	Mon Apr 10 15:27:11 2006
 @@ -21,8 +21,8 @@
     Boston, MA 02111-1307, USA.
  */
@@ -11,11 +11,3 @@
  
  G_BEGIN_DECLS
  
-@@ -45,6 +45,7 @@ G_BEGIN_DECLS
- #define GLIBTOP_SUID_PROC_ARGS		(1 << GLIBTOP_SYSDEPS_PROC_ARGS)
- #define GLIBTOP_SUID_PROC_MAP		(1 << GLIBTOP_SYSDEPS_PROC_MAP)
- #define GLIBTOP_SUID_NETLOAD		(1 << GLIBTOP_SYSDEPS_NETLOAD)
-+#define GLIBTOP_SUID_NETLIST		0
- #define GLIBTOP_SUID_PPP		(1 << GLIBTOP_SYSDEPS_PPP)
- 
- G_END_DECLS
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c b/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c
deleted file mode 100644
index bb09b138f..000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c
+++ /dev/null
@@ -1,95 +0,0 @@
---- sysdeps/freebsd/sysinfo.c.orig	Thu Jun  9 22:56:29 2005
-+++ sysdeps/freebsd/sysinfo.c	Thu Jun  9 22:58:36 2005
-@@ -0,0 +1,92 @@
-+/* $Id: patch-sysdeps_freebsd_sysinfo.c,v 1.3 2005-12-15 00:13:23 marcus Exp $ */
-+
-+/* Copyright (C) 1998-99 Martin Baulig
-+   This file is part of LibGTop 1.0.
-+
-+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-+
-+   LibGTop is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License,
-+   or (at your option) any later version.
-+
-+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+   for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with LibGTop; see the file COPYING. If not, write to the
-+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+*/
-+
-+#include <config.h>
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <glibtop/error.h>
-+#include <glibtop/cpu.h>
-+#include <glibtop/sysinfo.h>
-+
-+static const unsigned long _glibtop_sysdeps_sysinfo =
-+(1L << GLIBTOP_SYSINFO_CPUINFO);
-+
-+static glibtop_sysinfo sysinfo = { .flags = 0 };
-+
-+static void
-+init_sysinfo (glibtop *server)
-+{
-+	char *model;
-+	int ncpus = 1;
-+	int mhz = 0;
-+	size_t len;
-+
-+	if(G_LIKELY(sysinfo.flags)) return;
-+
-+	glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
-+
-+	len = sizeof (ncpus);
-+	sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0);
-+	len = 0;
-+	sysctlbyname ("hw.model", NULL, &len, NULL, 0);
-+	model = malloc (len);
-+	sysctlbyname ("hw.model", model, &len, NULL, 0);
-+	len = sizeof (mhz);
-+	sysctlbyname ("hw.clockrate", &mhz, &len, NULL, 0);
-+
-+	for(sysinfo.ncpu = 0;
-+	    sysinfo.ncpu < GLIBTOP_NCPU && sysinfo.ncpu < ncpus;
-+	    sysinfo.ncpu++) {
-+
-+		glibtop_entry * const cpuinfo = &sysinfo.cpuinfo[sysinfo.ncpu];
-+
-+		cpuinfo->labels = g_ptr_array_new ();
-+
-+		cpuinfo->values = g_hash_table_new_full(g_str_hash, g_str_equal,
-+							g_free, g_free);
-+
-+		cpuinfo->descriptions = g_hash_table_new_full(g_str_hash, g_str_equal,
-+							g_free, g_free);
-+
-+		g_ptr_array_add (cpuinfo->labels, "processor");
-+		g_hash_table_insert (cpuinfo->values, "processor", &sysinfo.ncpu);
-+
-+		g_ptr_array_add (cpuinfo->labels, "vendor_id");
-+		g_hash_table_insert (cpuinfo->values, "vendor_id", model);
-+
-+		g_ptr_array_add (cpuinfo->labels, "cpu MHz");
-+		g_hash_table_insert (cpuinfo->values, "cpu MHz", &mhz);
-+
-+	}
-+
-+	free (model);
-+
-+	sysinfo.flags = _glibtop_sysdeps_sysinfo;
-+}
-+
-+const glibtop_sysinfo *
-+glibtop_get_sysinfo_s (glibtop *server)
-+{
-+	init_sysinfo (server);
-+	return &sysinfo;
-+}
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index 61e22244d..020a91183 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -77,6 +77,7 @@ 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/ka/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ko/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ku/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ky/LC_MESSAGES/libgtop-2.0.mo