Fixes so that alpha will (hopefully) build. Mainly addition of includes.

7 files changed, 125 insertions, 9 deletions

diff --git a/comms/plptools/files/patch-sum b/comms/plptools/files/patch-sum
index cdaf42bd427..94aaac37d53 100644
--- a/comms/plptools/files/patch-sum
+++ b/comms/plptools/files/patch-sum
@@ -1,4 +1,9 @@
-$NetBSD: patch-sum,v 1.3 2001/04/04 07:59:29 skrll Exp $
+$NetBSD: patch-sum,v 1.4 2001/04/04 08:53:43 skrll Exp $
 
 SHA1 (patch-aa) = cfb95f4970b6e7c8d17bc79250f4500ee0da3963
-SHA1 (patch-ab) = 4b9cf43bb1e50270b8843c02e0a5aafda5d197a9
+SHA1 (patch-ab) = 00fee9bb2eebf357b171ac640163a943485f482f
+SHA1 (patch-ac) = 5c5d58340034eef0dc708d7f49de5daab3e60721
+SHA1 (patch-ad) = de550f23304b6205f0d4a6b40cc32307c41a509f
+SHA1 (patch-ae) = 46b1d9714397c7b9d6b3fb5d053cda44fc5f10fd
+SHA1 (patch-af) = 41f937ef89ba41d79b531ffc57fd77dee0608a93
+SHA1 (patch-ag) = 536521b46cfea9d17c78ee212f693fd32b50ba5f
diff --git a/comms/plptools/patches/patch-ab b/comms/plptools/patches/patch-ab
index 57c524326a9..1009b763e03 100644
--- a/comms/plptools/patches/patch-ab
+++ b/comms/plptools/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2001/04/04 07:59:30 skrll Exp $
+$NetBSD: patch-ab,v 1.4 2001/04/04 08:53:44 skrll Exp $
 
 --- plpnfsd/mp_mount.c.orig	Mon Jan 17 11:49:41 2000
 +++ plpnfsd/mp_mount.c
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.3 2001/04/04 07:59:30 skrll Exp $
  #include <stdio.h>
  #include <signal.h>
  #include <sys/stat.h>
-@@ -59,6 +59,16 @@
+@@ -59,6 +59,17 @@
  #endif
  #endif				/* __FreeBSD__ */
  
@@ -20,6 +20,7 @@ $NetBSD: patch-ab,v 1.3 2001/04/04 07:59:30 skrll Exp $
 +#include <netinet/in.h>
 +#include <arpa/inet.h>
 +#include <sys/types.h>
++#include <stdlib.h>
 +#include <unistd.h>
 +#include <strings.h>
 +#include <nfs/nfsmount.h>
@@ -28,7 +29,7 @@ $NetBSD: patch-ab,v 1.3 2001/04/04 07:59:30 skrll Exp $
  #include <rpc/rpc.h>
  #include "nfs_prot.h"
  
-@@ -147,7 +157,7 @@
+@@ -147,7 +158,7 @@
  	struct mntent *ent;
  #endif
  #endif
@@ -37,7 +38,7 @@ $NetBSD: patch-ab,v 1.3 2001/04/04 07:59:30 skrll Exp $
  	struct stat statb;
  #endif
  
-@@ -229,7 +239,7 @@
+@@ -229,7 +240,7 @@
  #else
  	struct nfs_args nfs_args;
  #endif
@@ -46,7 +47,7 @@ $NetBSD: patch-ab,v 1.3 2001/04/04 07:59:30 skrll Exp $
  	int mount_flags;
  #endif
  
-@@ -405,20 +415,23 @@
+@@ -405,20 +416,23 @@
  #endif
  
  #ifdef __NetBSD__
@@ -71,7 +72,7 @@ $NetBSD: patch-ab,v 1.3 2001/04/04 07:59:30 skrll Exp $
  #endif
  
  #if defined(_IBMR2)
-@@ -448,7 +461,7 @@
+@@ -448,7 +462,7 @@
  #if defined(__sgi) || (defined(sun) && defined(__SVR4))
  			if (mount("", dir, MS_DATA, "nfs", &nfs_args, sizeof(nfs_args)))
  #endif
@@ -80,7 +81,7 @@ $NetBSD: patch-ab,v 1.3 2001/04/04 07:59:30 skrll Exp $
  			if (mount(MOUNT_NFS, dir, 0, (caddr_t) & nfs_args))
  #endif
  #ifdef hpux
-@@ -464,7 +477,7 @@
+@@ -464,7 +478,7 @@
  			if (aix3_mount("psion:loc", dir, 0, MOUNT_TYPE_NFS, &nfs_args, "plpnfsd"))
  #endif
  
diff --git a/comms/plptools/patches/patch-ac b/comms/plptools/patches/patch-ac
new file mode 100644
index 00000000000..11d1517fe1f
--- /dev/null
+++ b/comms/plptools/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.3 2001/04/04 08:53:44 skrll Exp $
+
+--- plpftp/ftp.cc.orig	Mon Jan 17 11:49:41 2000
++++ plpftp/ftp.cc
+@@ -335,7 +335,7 @@
+ 				// never used to do this
+ 				char dateBuff[100];
+                                	struct tm *t;
+-                               	t = localtime(&time);
++                               	t = localtime((time_t *)&time);
+                                	strftime(dateBuff, 100, "%c", t);
+                                	cout << a.opAttr(attr);
+                                	cout << " " << dec << setw(10) << setfill(' ') << size;
+@@ -365,7 +365,7 @@
+ 			else {
+ 				char dateBuff[100];
+ 				struct tm *t;
+-				t = localtime(&mtime);
++				t = localtime((time_t *)&mtime);
+ 				strftime(dateBuff, 100, "%c %Z", t);
+ 				cout << dateBuff << endl;
+ 			}
+@@ -457,7 +457,7 @@
+ 					long attr = s.getDWord(8);
+ 					char dateBuff[100];
+                                 	struct tm *t;
+-                                	t = localtime(&date);
++                                	t = localtime((time_t *)&date);
+                                 	strftime(dateBuff, 100, "%c", t);
+                                 	cout << a.opAttr(attr);
+                                 	cout << " " << dec << setw(10) << setfill(' ') << size;
diff --git a/comms/plptools/patches/patch-ad b/comms/plptools/patches/patch-ad
new file mode 100644
index 00000000000..27d8fa88d55
--- /dev/null
+++ b/comms/plptools/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2001/04/04 08:53:44 skrll Exp $
+
+--- plpnfsd/mp_main.c.orig	Mon Jan 17 11:49:41 2000
++++ plpnfsd/mp_main.c
+@@ -17,7 +17,7 @@
+ #include "nfs_prot.h"
+ #include "mp.h"
+ #include "defs.h"
+-#if defined (__SVR4) || defined(__sgi)
++#if defined (__SVR4) || defined(__sgi) || defined(__NetBSD__)
+ #include <stdlib.h>		/* getenv */
+ #include <string.h>		/* strcmp */
+ #endif
diff --git a/comms/plptools/patches/patch-ae b/comms/plptools/patches/patch-ae
new file mode 100644
index 00000000000..b60408977a4
--- /dev/null
+++ b/comms/plptools/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2001/04/04 08:53:44 skrll Exp $
+
+--- plpnfsd/mp_inode.c.orig	Mon Jul  5 22:33:05 1999
++++ plpnfsd/mp_inode.c
+@@ -11,7 +11,7 @@
+ #include "mp.h"
+ #include "rfsv_api.h"
+ 
+-#if defined(__SVR4) || defined(__GLIBC__) || defined(__FreeBSD__)
++#if defined(__SVR4) || defined(__GLIBC__) || defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <string.h>
+ #include <stdlib.h>
+ #endif
diff --git a/comms/plptools/patches/patch-af b/comms/plptools/patches/patch-af
new file mode 100644
index 00000000000..a5fbc916c59
--- /dev/null
+++ b/comms/plptools/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2001/04/04 08:53:44 skrll Exp $
+
+--- plpnfsd/mp_pfs_ops.c.orig	Mon Jan 17 11:49:41 2000
++++ plpnfsd/mp_pfs_ops.c
+@@ -9,7 +9,7 @@
+ #include "OSdefs.h"
+ #include <stdio.h>
+ #include <ctype.h>
+-#if defined(__SVR4) || defined(__GLIBC__)
++#if defined(__SVR4) || defined(__GLIBC__) || defined(__NetBSD__)
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
diff --git a/comms/plptools/patches/patch-ag b/comms/plptools/patches/patch-ag
new file mode 100644
index 00000000000..4f639bc3788
--- /dev/null
+++ b/comms/plptools/patches/patch-ag
@@ -0,0 +1,40 @@
+$NetBSD: patch-ag,v 1.1 2001/04/04 08:53:45 skrll Exp $
+
+--- plpnfsd/nfs_prot_svc.c.orig	Mon Jul  5 22:33:06 1999
++++ plpnfsd/nfs_prot_svc.c
+@@ -8,7 +8,7 @@
+ #include "OSdefs.h"
+ 
+ #define PORTMAP
+-#ifdef __SVR4
++#if defined(__SVR4) || defined(__NetBSD__)
+ #include <unistd.h>
+ #include <stdlib.h>
+ #endif
+@@ -16,7 +16,7 @@
+ #include <rpc/rpc.h>
+ #include "nfs_prot.h"
+ #include "mp.h"
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) || defined(__NetBSD__)
+ #include <string.h>
+ #endif
+ 
+@@ -197,7 +197,7 @@
+ 	}
+ 	memset((char *)&argument, 0, sizeof(argument));
+ #if !defined(__SVR4) && !defined(__FreeBSD__)
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) || defined(__NetBSD__)
+ 	if (!svc_getargs(transp, (xdrproc_t)xdr_argument, (caddr_t)&argument)) {
+ #else
+ 	if (!svc_getargs(transp, xdr_argument, &argument)) {
+@@ -217,7 +217,7 @@
+ 		svcerr_systemerr(transp);
+ 	}
+ #if !defined(__SVR4) && !defined(__FreeBSD__)
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) || defined(__NetBSD__)
+ 	if (!svc_freeargs(transp, (xdrproc_t)xdr_argument,(caddr_t)&argument)) {
+ #else
+ 	if (!svc_freeargs(transp, xdr_argument, &argument)) {