>Number:         34957
>Category:       pkg
>Synopsis:       update gkrellm 2.2.10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Nov 01 01:05:00 +0000 2006
>Originator:     "" <anthony.mallet@useless-ficus.net>
>Release:        NetBSD 4.99.3 i386
>Organization:
>Environment:


System: NetBSD 4.99.3 (CITRUS) #4: Sat Oct 21 03:38:26 CEST 2006
	troot@citrus:/usr/obj/sys/arch/i386/compile/CITRUS



>Description:


Update gkrellm to 2.2.10.
No big change required, only slight updates to patch-a{d,e}. The diff is attached.



>How-To-Repeat:





>Fix:


--- patch begins here ---
Index: Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gkrellm/Makefile.common,v
retrieving revision 1.15
diff -u -r1.15 Makefile.common
--- Makefile.common	13 Apr 2006 19:14:44 -0000	1.15
+++ Makefile.common	31 Oct 2006 23:34:13 -0000
@@ -21,7 +21,7 @@
 MAKE_ENV+=		DEBUG=yes
 .endif
 
-GKRELLM_VERSION=	2.2.9
+GKRELLM_VERSION=	2.2.10
 GKRELLM_DISTBASE=	gkrellm-${GKRELLM_VERSION}
 GKRELLM_SRCDIR=		${WRKDIR}/${GKRELLM_DISTBASE}
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gkrellm/distinfo,v
retrieving revision 1.37
diff -u -r1.37 distinfo
--- distinfo	13 Aug 2006 07:33:37 -0000	1.37
+++ distinfo	31 Oct 2006 23:34:13 -0000
@@ -1,13 +1,13 @@
 $NetBSD: distinfo,v 1.37 2006/08/13 07:33:37 xtraeme Exp $
 
-SHA1 (gkrellm-2.2.9.tar.bz2) = 114c09c78ae27bbb1b2f4c2edb346800831f2cef
-RMD160 (gkrellm-2.2.9.tar.bz2) = e6de12774ec85c51dce18e3208340d1a080a6398
-Size (gkrellm-2.2.9.tar.bz2) = 691133 bytes
+SHA1 (gkrellm-2.2.10.tar.bz2) = 329d0ba5600998f21b75491937c3c2924ab6ed40
+RMD160 (gkrellm-2.2.10.tar.bz2) = 6694838015716c09291887ae598daceb4f4b440f
+Size (gkrellm-2.2.10.tar.bz2) = 718894 bytes
 SHA1 (patch-aa) = bc07107ed828a5a86012cae39316c1d35d2d7a4d
 SHA1 (patch-ab) = e900c811ddea106efee5cbfc04d0cf14cc6e6451
 SHA1 (patch-ac) = 8890d5a5e8eaf21508a1bf91de788183fd6f7a75
-SHA1 (patch-ad) = 18218e5e9e7a8cfaabb20ec03865670ae66a15bd
-SHA1 (patch-ae) = e7c85ed5985bffd4cc2528b8c9fe258436257f75
+SHA1 (patch-ad) = f0f32a2bd2b3f0891ca7891c3e5d03fc182f714b
+SHA1 (patch-ae) = 7e30e216b817e3d5ee9707f77285561ccfe31987
 SHA1 (patch-ag) = 6791436e17fccd7265cda8b4e3da229c4937c20f
 SHA1 (patch-ah) = 2018be5c2dd11c22c6d3f7c7fc8607e2c63123f3
 SHA1 (patch-ai) = 234e3e1e458e5709157668cf7d18faabdd076071
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gkrellm/patches/patch-ad,v
retrieving revision 1.2
diff -u -r1.2 patch-ad
--- patches/patch-ad	8 Sep 2005 13:19:56 -0000	1.2
+++ patches/patch-ad	31 Oct 2006 23:34:13 -0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2005/09/08 13:19:56 cube Exp $
+$NetBSD$
 
---- src/sysdeps/bsd-net-open.c.orig	2005-05-24 05:44:48.000000000 +0200
-+++ src/sysdeps/bsd-net-open.c
+--- src/sysdeps/bsd-net-open.c.orig	2006-07-20 23:38:57.000000000 +0200
++++ src/sysdeps/bsd-net-open.c	2006-10-31 23:15:06.000000000 +0100
 @@ -23,110 +23,10 @@
  
  
@@ -68,7 +68,7 @@
 -		/* Separate read/write stats were implemented in NetBSD 1.6K.
 -		*/
 -
--#if __NetBSD_Version__ >= 106110000
+-#if (__NetBSD_Version__ >= 106110000) || defined(__OpenBSD__)
 -		rbytes = d.dk_rbytes;
 -		wbytes = d.dk_wbytes;
 -#else
@@ -115,7 +115,7 @@
  #include "../inet.h"
  
  /* NO IPv6 SUPPORT YET */
-@@ -191,6 +91,7 @@ gkrellm_sys_inet_read_tcp_data(void)
+@@ -193,6 +93,7 @@
        next = (struct inpcb *)inpcb.inp_queue.cqe_next;
     }
  }
@@ -123,7 +123,7 @@
  
  gboolean
  gkrellm_sys_inet_init(void)
-@@ -199,95 +100,6 @@ gkrellm_sys_inet_init(void)
+@@ -201,95 +102,6 @@
  	}
  
  /* ===================================================================== */
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gkrellm/patches/patch-ae,v
retrieving revision 1.3
diff -u -r1.3 patch-ae
--- patches/patch-ae	13 Apr 2006 19:14:45 -0000	1.3
+++ patches/patch-ae	31 Oct 2006 23:34:13 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2006/04/13 19:14:45 cube Exp $
+$NetBSD$
 
---- server/gkrellmd-private.h.orig	2006-03-30 00:23:50.000000000 +0200
-+++ server/gkrellmd-private.h
-@@ -28,6 +28,10 @@
+--- server/gkrellmd-private.h.orig	2006-10-26 23:21:59.000000000 +0200
++++ server/gkrellmd-private.h	2006-10-31 23:20:08.000000000 +0100
+@@ -29,6 +29,10 @@
  #endif
  #endif
  
@@ -13,7 +13,7 @@
  #if defined(__FreeBSD__)
  #include <sys/param.h>
  #if __FreeBSD_version >= 400000
-@@ -41,6 +45,7 @@
+@@ -42,6 +46,7 @@
  
  #if defined(__NetBSD__)
  #define HAVE_GETADDRINFO	1
@@ -21,7 +21,7 @@
  #  if __NetBSD_Version__ <= 105010000
  #    define sa_family_t unsigned char
  #  endif
-@@ -66,12 +71,10 @@
+@@ -67,12 +72,10 @@
  
  #if !defined(__FreeBSD__) && !defined(__linux__) && !defined(__NetBSD__) \
      && !defined(__OpenBSD__) && !defined(__solaris__) && !defined(WIN32) \
@@ -32,10 +32,10 @@
  
 -extern int	errno;
 -
- #define DEBUG_SYSDEP	0x1
- #define DEBUG_MAIL		0x10
- #define DEBUG_NET		0x20
-@@ -88,6 +91,7 @@ extern int	errno;
+ #define DEBUG_SYSDEP		0x1
+ #define DEBUG_MAIL			0x10
+ #define DEBUG_NET			0x20
+@@ -89,6 +92,7 @@
  #define	SENSOR_GROUP_MAINBOARD	0
  #define	SENSOR_GROUP_DISK		1
  
@@ -43,7 +43,7 @@
  
  struct GkrellmdConfig
  	{
-@@ -142,3 +146,4 @@ void			gkrellmd_serve_setup(GkrellmdClie
+@@ -145,3 +149,4 @@
  
  GkrellmdMonitor *gkrellmd_init_mail_monitor(void);
  
--- patch ends here ---