Make it compile on Solaris.

2 files changed, 42 insertions, 1 deletions

diff --git a/net/vncviewer/distinfo b/net/vncviewer/distinfo
index 31b019e9000..e41db20df9b 100644
--- a/net/vncviewer/distinfo
+++ b/net/vncviewer/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/04/25 04:33:47 itojun Exp $
+$NetBSD: distinfo,v 1.5 2002/10/23 16:53:34 bouyer Exp $
 
 SHA1 (vnc-3.3.3r2_unixsrc.tgz) = 98e9d2e2c2d0f4f9cb9cafee22d21a868189b176
 Size (vnc-3.3.3r2_unixsrc.tgz) = 2072772 bytes
 SHA1 (vnc-3.3.3r2-v6-20010421.diff.gz) = d2af7e0fb0074200f490f6463fb250901368875e
 Size (vnc-3.3.3r2-v6-20010421.diff.gz) = 6510 bytes
 SHA1 (patch-aa) = 1f2a6e6cb65c8b206e357fa974627c4f0b45f510
+SHA1 (patch-ab) = 366bad1410e7b49e7a742420033a47cc22b115fb
diff --git a/net/vncviewer/patches/patch-ab b/net/vncviewer/patches/patch-ab
new file mode 100644
index 00000000000..7cc6338d5db
--- /dev/null
+++ b/net/vncviewer/patches/patch-ab
@@ -0,0 +1,40 @@
+$NetBSD: patch-ab,v 1.1 2002/10/23 16:53:34 bouyer Exp $
+
+--- vncviewer/sockets.c.orig	Wed Oct 23 18:48:55 2002
++++ vncviewer/sockets.c	Wed Oct 23 18:50:54 2002
+@@ -210,7 +210,11 @@
+     return -1;
+   }
+ 
++#ifdef SVR4
++  if (connect(sock, sa, sizeof(struct sockaddr_in)) < 0) {
++#else
+   if (connect(sock, sa, sa->sa_len) < 0) {
++#endif
+     fprintf(stderr,programName);
+     perror(": ConnectToTcpAddr: connect");
+     close(sock);
+@@ -374,18 +378,20 @@
+ 
+   sin = (struct sockaddr_in *)sa;
+   sin->sin_family = AF_INET;
++#ifndef SVR4
+   sin->sin_len = sizeof(struct sockaddr_in);
++#endif
+   sin->sin_port = 0;
+ 
+   if (strcmp(str,"") == 0) {
+-    *addr = 0; /* local */
++    memset(addr, 0, sizeof(struct sockaddr_in)); /* local */
+     return True;
+   }
+ 
+-  if ((addr.s_addr = inet_addr(str)) == -1) {
++  if ((addr->s_addr = inet_addr(str)) == -1) {
+     if (!(hp = gethostbyname(str)))
+       return False;
+-    memcpy(&addr, hp->h_addr, sizeof(struct in_addr));
++    memcpy(addr, hp->h_addr, sizeof(struct in_addr));
+   }
+ 
+   return False;