Butcher this into compiling and apparently running ok on NetBSD-current.

5 files changed, 94 insertions, 5 deletions

diff --git a/net/rdist6/distinfo b/net/rdist6/distinfo
index cc13ec586d3..c1b5e4ac9bd 100644
--- a/net/rdist6/distinfo
+++ b/net/rdist6/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/09/06 03:36:04 kim Exp $
+$NetBSD: distinfo,v 1.4 2004/05/31 02:18:44 kim Exp $
 
 SHA1 (freerdist-0.92.tar.gz) = 84db4efd8d223a7e10d62e386349aa9236f71ae3
 Size (freerdist-0.92.tar.gz) = 135824 bytes
@@ -6,5 +6,8 @@ SHA1 (patch-aa) = 0ea7d5838b7d491f2f599e0b53b195978bae2565
 SHA1 (patch-ab) = 3cd2de9d584e8aaa0cf4258c66ba027ff767a367
 SHA1 (patch-ac) = 78df932333c8742139368abb5d12b910d34e222c
 SHA1 (patch-ad) = 89500d25dc2fb34c0295836f7ab18433218c85ea
-SHA1 (patch-ae) = 5df68e7152f0a8c5922b94cdf3a3ba3e306250d7
+SHA1 (patch-ae) = 5db32068ad821419cd71676a933b9639fca9e37e
 SHA1 (patch-ai) = 3f96e7440fe4ac5d6180a4137806fe70e2033565
+SHA1 (patch-aj) = db6307ff40a8db7428fc23f7cfd40a3152c465dc
+SHA1 (patch-ak) = a65735786a4cbe19874e83cdc8ac2d6aadb8c14e
+SHA1 (patch-al) = e8a20d24e0682634263fb80a01b85c688eaea998
diff --git a/net/rdist6/patches/patch-ae b/net/rdist6/patches/patch-ae
index 1ea614dce73..a19b3912483 100644
--- a/net/rdist6/patches/patch-ae
+++ b/net/rdist6/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.3 2001/03/12 19:06:51 kim Exp $
+$NetBSD: patch-ae,v 1.4 2004/05/31 02:18:44 kim Exp $
 
---- config/os-netbsd.h.orig	Mon Mar 12 13:16:18 2001
-+++ config/os-netbsd.h	Mon Mar 12 13:59:27 2001
+--- config/os-netbsd.h.orig	2001-03-12 13:16:18.000000000 -0500
++++ config/os-netbsd.h	2004-05-30 22:01:15.000000000 -0400
 @@ -45,6 +45,7 @@
   * Things we need
   */
@@ -10,3 +10,15 @@ $NetBSD: patch-ae,v 1.3 2001/03/12 19:06:51 kim Exp $
  
  /*
   * Set process args to messages that show up when running ps(1)
+@@ -86,7 +87,11 @@
+ /*
+  * Select the type of statfs() system call (if any).
+  */
++#if __NetBSD_Version__ < 200060000
+ #define STATFS_TYPE	STATFS_44BSD
++#else
++#define STATFS_TYPE	STATFS_SVR4
++#endif
+ 
+ /*
+  * Use f_fstypename in struct statfs.
diff --git a/net/rdist6/patches/patch-aj b/net/rdist6/patches/patch-aj
new file mode 100644
index 00000000000..c01c50ec9cf
--- /dev/null
+++ b/net/rdist6/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1 2004/05/31 02:18:44 kim Exp $
+
+--- config/config-def.h.orig	1995-05-20 19:35:17.000000000 -0400
++++ config/config-def.h	2004-05-30 21:54:24.000000000 -0400
+@@ -92,6 +92,7 @@
+ #define STATFS_BSD		1
+ #define STATFS_SYSV		2
+ #define STATFS_OSF1		3
++#define STATFS_SVR4		4
+ 
+ /*
+  * Arg types
diff --git a/net/rdist6/patches/patch-ak b/net/rdist6/patches/patch-ak
new file mode 100644
index 00000000000..07ece5c3371
--- /dev/null
+++ b/net/rdist6/patches/patch-ak
@@ -0,0 +1,18 @@
+$NetBSD: patch-ak,v 1.1 2004/05/31 02:18:44 kim Exp $
+
+--- include/filesys.h.orig	1999-08-04 11:57:31.000000000 -0400
++++ include/filesys.h	2004-05-30 22:13:44.000000000 -0400
+@@ -104,10 +104,12 @@
+ #	include <sys/statfs.h>
+ 	typedef struct statfs		statfs_t;
+ #	define f_bavail			f_bfree
+-#  elif defined(SVR4)
++#  elif defined(SVR4) || STATFS_TYPE == STATFS_SVR4
+ #	include <sys/statvfs.h>
+ 	typedef struct statvfs		statfs_t;
+ #	define statfs(mp,sb)		statvfs(mp,sb)
++#	define getfsstat(buf,sz,fl)	getvfsstat(buf,sz,fl)
++#	define f_flags			f_flag
+ #  elif STATFS_TYPE == STATFS_44BSD || STATFS_TYPE == STATFS_OSF1
+ 	typedef struct statfs		statfs_t;
+ #  else
diff --git a/net/rdist6/patches/patch-al b/net/rdist6/patches/patch-al
new file mode 100644
index 00000000000..4865354e065
--- /dev/null
+++ b/net/rdist6/patches/patch-al
@@ -0,0 +1,44 @@
+$NetBSD: patch-al,v 1.1 2004/05/31 02:18:44 kim Exp $
+
+--- src/filesys-os.c.orig	1999-08-04 11:57:33.000000000 -0400
++++ src/filesys-os.c	2004-05-30 22:10:03.000000000 -0400
+@@ -49,7 +49,7 @@
+  */
+ 
+ #if 	FSI_TYPE == FSI_GETFSSTAT
+-static struct statfs   *mnt = NULL;
++static statfs_t   *mnt = NULL;
+ #endif	/* FSI_GETFSSTAT */
+ 
+ #if	FSI_TYPE == FSI_MNTCTL
+@@ -101,17 +101,17 @@
+ 	if (mntbuf)
+ 		(void) free(mntbuf);
+ 
+-	size = getfsstat((struct statfs *) NULL, 0, MNT_WAIT);
++	size = getfsstat((statfs_t *) NULL, 0, MNT_WAIT);
+ 	if (size == -1)
+ 		return (NULL);
+-	size *= sizeof(struct statfs);
++	size *= sizeof(statfs_t);
+ 	mntbuf = (char *) xmalloc(size);
+ 
+-	entries_left = getfsstat((struct statfs *)mntbuf, size, MNT_WAIT);
++	entries_left = getfsstat((statfs_t *)mntbuf, size, MNT_WAIT);
+ 	if (entries_left == -1)
+ 		return((FILE *) NULL);
+ 
+-	mnt = (struct statfs *) mntbuf;
++	mnt = (statfs_t *) mntbuf;
+ 
+ 	return((FILE *) 1);
+ }
+@@ -195,7 +195,7 @@
+ 		mntstruct.me_type = METYPE_OTHER;
+ 	}
+ 
+-	mnt = (struct statfs*)(sizeof(struct statfs)+(ulong)mnt);
++	mnt = (statfs_t *)(sizeof(statfs_t)+(ulong)mnt);
+ 	entries_left--;
+ 
+ 	return(&mntstruct);