Arrggh... I've been looking at this screen for far too long today.

Make sure the patch doesn't include an RCS Id.

2 files changed, 20 insertions, 39 deletions

diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index e6caf33613d..2711959b4cc 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/08/21 15:36:22 skrll Exp $
+$NetBSD: distinfo,v 1.7 2002/08/21 16:00:11 skrll Exp $
 
 SHA1 (kdebase-3.0.2.tar.bz2) = 763af0ddce718789fae3dfe2b67036dbc2d01a02
 Size (kdebase-3.0.2.tar.bz2) = 13115043 bytes
@@ -89,7 +89,7 @@ SHA1 (patch-db) = 9af64d1118aa30d99202430efc2921c731ae4a81
 SHA1 (patch-dc) = ae7d541d91bd466142984b3680cc1e40834f528d
 SHA1 (patch-dd) = 2e9da1069c86ccafd19dbd0ed2b4594c5a4e2f71
 SHA1 (patch-de) = 1fbea1abe5a8aefc0eacdc94d4ff60d26fb3c02a
-SHA1 (patch-df) = 7600b54fec5d7ad5f81a53dbbea37ee4bb919852
+SHA1 (patch-df) = 5813b78817389faa15378ebcff3f324e8a605f0b
 SHA1 (patch-dg) = 2a0e3e14049665549a793cf0f785fc55cc1c7d5d
 SHA1 (patch-dh) = b84568ed97b14b16bbfdbc73dcb91b920242ad1b
 SHA1 (patch-di) = c6044dc47bde5eee686163ca2f3e90d016dacd59
diff --git a/x11/kdebase3/patches/patch-df b/x11/kdebase3/patches/patch-df
index b7086d8d4b8..88fcf63fcdf 100644
--- a/x11/kdebase3/patches/patch-df
+++ b/x11/kdebase3/patches/patch-df
@@ -1,29 +1,10 @@
-$NetBSD: patch-df,v 1.3 2002/08/21 15:33:06 skrll Exp $
+$NetBSD: patch-df,v 1.4 2002/08/21 16:00:13 skrll Exp $
 
---- ksysguard/ksysguardd/FreeBSD/netdev.c.orig	Tue Sep 18 15:03:53 2001
-+++ ksysguard/ksysguardd/FreeBSD/netdev.c	Tue Aug 20 13:51:32 2002
-@@ -1,319 +1,263 @@
--/*
--    KSysGuard, the KDE System Guard
--   
--	Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de>
--    
--    This program is free software; you can redistribute it and/or
--    modify it under the terms of version 2 of the GNU General Public
--    License as published by the Free Software Foundation.
--
--    This program 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 this program; if not, write to the Free Software
--    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--
--	$Id: patch-df,v 1.3 2002/08/21 15:33:06 skrll Exp $
--*/
--
+--- ksysguard/ksysguardd/FreeBSD/netdev.c.orig	Wed Aug 21 17:39:19 2002
++++ ksysguard/ksysguardd/FreeBSD/netdev.c
+@@ -20,15 +20,14 @@
+ */
+ 
 -#include <fcntl.h>
 +#include <sys/types.h> /* for sys/socket.h, ifaddrs.h */
 +#include <ifaddrs.h>
@@ -44,7 +25,7 @@ $NetBSD: patch-df,v 1.3 2002/08/21 15:33:06 skrll Exp $
 -
  
  #include "Command.h"
- #include "ksysguardd.h"
+@@ -36,284 +35,250 @@
  #include "netdev.h"
  
 -
@@ -97,10 +78,10 @@ $NetBSD: patch-df,v 1.3 2002/08/21 15:33:06 skrll Exp $
 -	begin++;
 -	strcpy(interface, begin);
 -	retval[0] = interface;
- 
+-
 -	return retval;
 -}
--
+ 
 -int numActivIfaces(void)
 -{
 -	int counter = 0;
@@ -289,10 +270,7 @@ $NetBSD: patch-df,v 1.3 2002/08/21 15:33:06 skrll Exp $
  
 -void exitNetDev(void)
 -{
-+
-+static void prInfo(const char *cmd, int N) {
-+	char *p, *q;
- 	int i;
+-	int i;
 -	char monitor[1024];
  
 -	for (i = 0; i < NetDevCnt; i++) {
@@ -319,8 +297,9 @@ $NetBSD: patch-df,v 1.3 2002/08/21 15:33:06 skrll Exp $
 -		removeMonitor(monitor);
 -	}
 -}
-+	if (!(p=rindex(cmd, '/'))) return;
-+	p++;
++static void prInfo(const char *cmd, int N) {
++	char *p, *q;
++	int i;
  
 -void updateNetDev(void)
 -{
@@ -328,6 +307,11 @@ $NetBSD: patch-df,v 1.3 2002/08/21 15:33:06 skrll Exp $
 -	int num_iface, i;
 -	size_t len;
 -	struct ifmibdata ifmd;
++	if (!(p=rindex(cmd, '/'))) return;
++	p++;
+ 
+-	len = sizeof(num_iface);
+-	sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0);
 +	q = p+strlen(p)-1;
 +	if ('?' != *q) return;
 +	*q=0;
@@ -336,9 +320,6 @@ $NetBSD: patch-df,v 1.3 2002/08/21 15:33:06 skrll Exp $
 +		if (!strcmp(p, opTable[N].op[i].label))
 +			fputs(opTable[N].op[i].info, CurrentClient);
  
--	len = sizeof(num_iface);
--	sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0);
--
 -	NetDevCnt = 0;
 -	for (i = 1; i < num_iface + 1; i++) {
 -		name[0] = CTL_NET;