Fix compilation on alpha.

7 files changed, 121 insertions, 2 deletions

diff --git a/misc/root/files/patch-sum b/misc/root/files/patch-sum
index 9f4b07d315a..1f8f078495b 100644
--- a/misc/root/files/patch-sum
+++ b/misc/root/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 2000/01/10 01:25:11 wiz Exp $
+$NetBSD: patch-sum,v 1.2 2000/12/28 02:16:27 wiz Exp $
 
 MD5 (patch-aa) = 73162f9b161f7842775dcc8f285627a3
 MD5 (patch-ab) = e817d5af65db142c0ebc8a3f179c5af9
@@ -9,3 +9,6 @@ MD5 (patch-af) = 354b49cfd500bae80f2b6fbe2711f9be
 MD5 (patch-ag) = 48ae63ea8594ab10def667a817f4c7dc
 MD5 (patch-ah) = 0a0c8c4a76db0e14712c1799a999798d
 MD5 (patch-ai) = 4ad0aa943b5e97a3e53e54e51df64243
+MD5 (patch-aj) = 2c004ee9563a23ffa4b2948979321b32
+MD5 (patch-ak) = 216c42d6f5e5e015c011d4905721691f
+MD5 (patch-al) = 99285a66061f7899d5c0b2f577f36a1d
diff --git a/misc/root/patches/patch-aj b/misc/root/patches/patch-aj
new file mode 100644
index 00000000000..475135432e1
--- /dev/null
+++ b/misc/root/patches/patch-aj
@@ -0,0 +1,40 @@
+$NetBSD: patch-aj,v 1.1 2000/12/28 02:16:27 wiz Exp $
+
+--- src/UNIX_UnixSystem.cxx.orig	Tue Nov  2 11:38:04 1999
++++ src/UNIX_UnixSystem.cxx
+@@ -1353,9 +1353,9 @@
+    // Get Internet Protocol (IP) address of host and port #.
+ 
+    struct sockaddr_in addr;
+-#if defined(R__AIX) || defined(R__FBSD)
++#if defined(R__AIX)
+    size_t len = sizeof(addr);
+-#elif defined(R__GLIBC)
++#elif defined(R__GLIBC) || defined(R__FBSD)
+    socklen_t len = sizeof(addr);
+ #else
+    int len = sizeof(addr);
+@@ -1391,9 +1391,9 @@
+    // Get Internet Protocol (IP) address of remote host and port #.
+ 
+    struct sockaddr_in addr;
+-#if defined(R__AIX) || defined(R__FBSD)
++#if defined(R__AIX)
+    size_t len = sizeof(addr);
+-#elif defined(R__GLIBC)
++#elif defined(R__GLIBC) || defined(R__FBSD)
+    socklen_t len = sizeof(addr);
+ #else
+    int len = sizeof(addr);
+@@ -1718,10 +1718,8 @@
+ 
+    if (sock < 0) return -1;
+ 
+-#if defined(R__GLIBC) || defined(_AIX43)
++#if defined(R__GLIBC) || defined(_AIX43) || defined(R__FBSD)
+    socklen_t optlen = sizeof(*val);
+-#elif defined(R__FBSD)
+-   size_t optlen = sizeof(*val);
+ #else
+    int optlen = sizeof(*val);
+ #endif
diff --git a/misc/root/patches/patch-ak b/misc/root/patches/patch-ak
new file mode 100644
index 00000000000..1c9d0700c6d
--- /dev/null
+++ b/misc/root/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2000/12/28 02:16:27 wiz Exp $
+
+--- src/ROOTD_rootd.cxx.orig	Tue Nov  2 11:45:18 1999
++++ src/ROOTD_rootd.cxx
+@@ -128,7 +128,7 @@
+ extern "C" char *crypt(const char *, const char *);
+ #endif
+ 
+-#ifdef __alpha
++#if defined(__alpha) && !defined(__NetBSD__)
+ extern "C" int initgroups(char *name, int basegid);
+ #endif
+ 
diff --git a/misc/root/patches/patch-al b/misc/root/patches/patch-al
new file mode 100644
index 00000000000..97d9eb13338
--- /dev/null
+++ b/misc/root/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2000/12/28 02:16:27 wiz Exp $
+
+--- src/PROOFD_proofd.cxx.orig	Tue Nov  2 11:45:22 1999
++++ src/PROOFD_proofd.cxx
+@@ -57,7 +57,7 @@
+ extern "C" char *crypt(const char *, const char *);
+ #endif
+ 
+-#ifdef __alpha
++#if defined(__alpha) && !defined(__NetBSD__)
+ extern "C" int initgroups(char *name, int basegid);
+ #endif
+ 
diff --git a/net/userppp/files/patch-sum b/net/userppp/files/patch-sum
index eeb95b1797c..fa163e13c7b 100644
--- a/net/userppp/files/patch-sum
+++ b/net/userppp/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/11/08 15:53:49 tron Exp $
+$NetBSD: patch-sum,v 1.4 2000/12/28 01:59:26 wiz Exp $
 
 MD5 (patch-aa) = 354ec23280a74ec5a34f32df68d02f5a
 MD5 (patch-ab) = 4e849b882fa232ea77efef54d0749f44
@@ -7,3 +7,5 @@ MD5 (patch-ad) = 68bb63d69846a116e2808b7a63abda05
 MD5 (patch-ae) = 601856884f45d9333f03ddc62fc1bd2c
 MD5 (patch-af) = bb164fb966afe3bd743645dd8ecf91e2
 MD5 (patch-ag) = d87f555eebb74cf100f75097377a83ea
+MD5 (patch-ah) = d8b895c88011951e3311dbdd78256460
+MD5 (patch-ai) = ef0131af5a44f8ab5ed8ad2d2de96feb
diff --git a/net/userppp/patches/patch-ah b/net/userppp/patches/patch-ah
new file mode 100644
index 00000000000..743158665fc
--- /dev/null
+++ b/net/userppp/patches/patch-ah
@@ -0,0 +1,26 @@
+$NetBSD: patch-ah,v 1.1 2000/12/28 01:59:26 wiz Exp $
+
+--- ppp/ip.c.orig	Tue Nov  7 06:45:44 2000
++++ ppp/ip.c
+@@ -656,8 +656,8 @@
+                "ESP: %s ---> ", inet_ntoa(pip->ip_src));
+       loglen += strlen(logbuf + loglen);
+       snprintf(logbuf + loglen, sizeof logbuf - loglen,
+-               "%s, spi %08x", inet_ntoa(pip->ip_dst),
+-               (u_int32_t) ptop);
++               "%s, spi %p", inet_ntoa(pip->ip_dst),
++               ptop);
+       loglen += strlen(logbuf + loglen);
+     }
+     break;
+@@ -668,8 +668,8 @@
+                "AH: %s ---> ", inet_ntoa(pip->ip_src));
+       loglen += strlen(logbuf + loglen);
+       snprintf(logbuf + loglen, sizeof logbuf - loglen,
+-               "%s, spi %08x", inet_ntoa(pip->ip_dst),
+-               (u_int32_t) (ptop + sizeof(u_int32_t)));
++               "%s, spi %p", inet_ntoa(pip->ip_dst),
++               (ptop + sizeof(u_int32_t)));
+       loglen += strlen(logbuf + loglen);
+     }
+     break;
diff --git a/net/userppp/patches/patch-ai b/net/userppp/patches/patch-ai
new file mode 100644
index 00000000000..7203cae9abc
--- /dev/null
+++ b/net/userppp/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.1 2000/12/28 01:59:26 wiz Exp $
+
+--- ppp/atm.c.orig	Tue Nov  7 06:45:45 2000
++++ ppp/atm.c
+@@ -80,7 +80,7 @@
+ {
+   ssize_t ret = write(p->fd, v, n);
+   if (ret < 0) {
+-    log_Printf(LogDEBUG, "atm_Sendto(%d): %s\n", n, strerror(errno));
++    log_Printf(LogDEBUG, "atm_Sendto(%ld): %s\n", (long)n, strerror(errno));
+     return ret;
+   }
+   return ret;
+@@ -91,7 +91,7 @@
+ {
+     ssize_t ret = read(p->fd, (char*)v, n);
+     if (ret < 0) {
+-      log_Printf(LogDEBUG, "atm_Recvfrom(%d): %s\n", n, strerror(errno));
++      log_Printf(LogDEBUG, "atm_Recvfrom(%ld): %s\n", (long)n, strerror(errno));
+       return ret;
+     }
+     return ret;