From f27da5c83258fc8e6481ff19361b98bf88e19794 Mon Sep 17 00:00:00 2001
From: Yukihiro Nakai <nakai@FreeBSD.org>
Date: Fri, 22 Oct 1999 09:35:49 +0000
Subject: [PATCH] Add some patches for the clean install.

---
 www/vrweb/Makefile       |  2 -
 www/vrweb/files/patch-aa | 91 +++++++++++++++++++++++++++++++++-------
 www/vrweb/files/patch-ab | 22 +++++-----
 www/vrweb/files/patch-ae | 12 +++++-
 www/vrweb/files/patch-ag | 23 ++++++++++
 www/vrweb/files/patch-ah | 26 ++++++++++++
 www/vrweb/files/patch-ai | 14 +++++++
 www/vrweb/files/patch-aj | 23 ++++++++++
 8 files changed, 183 insertions(+), 30 deletions(-)
 create mode 100644 www/vrweb/files/patch-ag
 create mode 100644 www/vrweb/files/patch-ah
 create mode 100644 www/vrweb/files/patch-ai
 create mode 100644 www/vrweb/files/patch-aj

diff --git a/www/vrweb/Makefile b/www/vrweb/Makefile
index 01584028a88c..113234c88fc1 100644
--- a/www/vrweb/Makefile
+++ b/www/vrweb/Makefile
@@ -15,8 +15,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
 
-BROKEN=		install
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
diff --git a/www/vrweb/files/patch-aa b/www/vrweb/files/patch-aa
index 89fa63bf6429..09ffdb6ec8ff 100644
--- a/www/vrweb/files/patch-aa
+++ b/www/vrweb/files/patch-aa
@@ -1,14 +1,77 @@
-*** src/common/utils/unixsocket.C.orig	Mon Jun 23 02:12:28 1997
---- src/common/utils/unixsocket.C	Mon Jun 23 02:17:04 1997
-***************
-*** 67,72 ****
---- 67,75 ----
-  #if defined(BSDI)
-  #  define DONT_HAVE_SENDFD
-  #endif
-+ #if defined(FreeBSD)
-+ #  define DONT_HAVE_SENDFD
-+ #endif
-  
-  #if ! (defined HAVE_SENDFD || defined DONT_HAVE_SENDFD)
-  #error SEND_FD
+--- src/common/utils/unixsocket.C.orig	Fri Feb 21 21:41:25 1997
++++ src/common/utils/unixsocket.C	Wed Oct 20 19:35:42 1999
+@@ -67,6 +67,9 @@
+ #if defined(BSDI)
+ #  define DONT_HAVE_SENDFD
+ #endif
++#if defined(FreeBSD)
++#  define DONT_HAVE_SENDFD
++#endif
+ 
+ #if ! (defined HAVE_SENDFD || defined DONT_HAVE_SENDFD)
+ #error SEND_FD
+@@ -110,19 +113,29 @@
+       sock = ::socket (AF_UNIX, SOCK_STREAM, 0) ;
+       if (sock < 0) {
+          DEBUGNL ("UNIXSocket::connect(): could not create socket") ;
++#ifndef __FreeBSD__
+          set_errno_(::errno) ;
++#endif
+          perror_("UNIXSocket::connect(): ::socket()") ;
+          return false ;
+       }
+       if (::connect (sock, (struct sockaddr*)&addr, addrlen) < 0) {
++#ifdef __FreeBSD__
++         if (errno == ECONNREFUSED && retries > 0) {
++#else
+          if (::errno == ECONNREFUSED && retries > 0) {
++#endif
+             // try again since peer's backlog may just be full
+             ::close (sock) ;
+             ::sleep (1) ; // ++++
+             continue ;
+          } else {
+             DEBUGNL ("UNIXSocket::connect(): cannot connect") ;
++#ifdef __FreeBSD__
++            set_errno_(errno) ;
++#else
+             set_errno_(::errno) ;
++#endif
+             perror_("UNIXSocket::connect(): ::connect()") ;
+             ::close (sock) ;
+             return false ;
+@@ -143,7 +156,11 @@
+    int sock = ::socket (AF_UNIX, SOCK_STREAM, 0) ;
+    if (sock < 0) {
+       DEBUGNL ("UNIXSocket::listen(): could not create socket") ;
++#ifdef __FreeBSD__
++      set_errno_(errno) ;
++#else
+       set_errno_(::errno) ;
++#endif
+       perror_("UNIXSocket::listen(): ::socket()") ;
+       return false ;
+    }
+@@ -160,14 +177,22 @@
+    // systems have 2 chars (len and family) instead.
+    if (::bind (sock, (struct sockaddr*)&addr, 2 + pathlen) < 0) {
+       DEBUGNL ("UNIXSocket::listen(): ::bind() error") ;
++#ifdef __FreeBSD__
++      set_errno_(errno) ;
++#else
+       set_errno_(::errno) ;
++#endif
+       perror_("UNIXSocket::listen(): ::bind()") ;
+       ::close (sock) ;
+       return false ;
+    }
+    if (::listen (sock, SOMAXCONN) < 0) {
+       DEBUGNL ("UNIXSocket::listen(): ::listen() error") ;
++#ifdef __FreeBSD__
++      set_errno_(errno) ;
++#else
+       set_errno_(::errno) ;
++#endif
+       perror_("UNIXSocket::listen(): ::listen()") ;
+       ::close (sock);
+       return false ;
diff --git a/www/vrweb/files/patch-ab b/www/vrweb/files/patch-ab
index b7557a7ea16c..22946a241c76 100644
--- a/www/vrweb/files/patch-ab
+++ b/www/vrweb/files/patch-ab
@@ -1,12 +1,10 @@
-*** src/common/OS/directory.C.orig	Mon Jun 23 02:29:52 1997
---- src/common/OS/directory.C	Mon Jun 23 02:31:27 1997
-***************
-*** 32,37 ****
---- 32,38 ----
-   * includes <sys/dir.h>, which is silly because <sys/dir.h>
-   * needs <sys/types.h>.
-   */
-+ #include <machine/types.h>
-  #include "types.h"
-  #ifdef apollo
-  #include <sys/dir.h>
+--- src/common/OS/directory.C.orig	Thu Jan 30 18:58:15 1997
++++ src/common/OS/directory.C	Fri Oct 22 14:58:52 1999
+@@ -32,6 +32,7 @@
+  * includes <sys/dir.h>, which is silly because <sys/dir.h>
+  * needs <sys/types.h>.
+  */
++#include <sys/types.h>
+ #include "types.h"
+ #ifdef apollo
+ #include <sys/dir.h>
diff --git a/www/vrweb/files/patch-ae b/www/vrweb/files/patch-ae
index ea13a09e019c..8482d0292306 100644
--- a/www/vrweb/files/patch-ae
+++ b/www/vrweb/files/patch-ae
@@ -1,5 +1,5 @@
---- src/harmony/scene/mesacontext.C.orig	Thu Apr 23 16:08:17 1998
-+++ src/harmony/scene/mesacontext.C	Thu Apr 23 16:08:47 1998
+--- src/harmony/scene/mesacontext.C.orig	Wed Feb 26 02:06:48 1997
++++ src/harmony/scene/mesacontext.C	Fri Oct 22 15:19:42 1999
 @@ -95,8 +95,8 @@
  
  #include <IV-X11/Xdefs.h>      /* Display, Font of X11 */
@@ -11,3 +11,11 @@
  #include <IV-X11/Xundefs.h>  /* get back to IV's names */
  
  #include <iostream.h>
+@@ -236,6 +236,7 @@
+     xdpy, &xvisinfo_, 1,  // rgb mode
+     0,  // no alpha planes (Mesa 2.0)
+     double_buffered_,
++    0,
+     imgcontext,  // ximage or pixmap
+     1, 0, 0,  // depth buffer, no stencil, no accum (Mesa 2.0)
+     0  // level (Mesa 2.0)
diff --git a/www/vrweb/files/patch-ag b/www/vrweb/files/patch-ag
new file mode 100644
index 000000000000..b32ddb5b9469
--- /dev/null
+++ b/www/vrweb/files/patch-ag
@@ -0,0 +1,23 @@
+--- src/common/utils/socket.C.orig	Wed Oct 20 19:23:22 1999
++++ src/common/utils/socket.C	Wed Oct 20 19:36:04 1999
+@@ -53,6 +53,8 @@
+ //
+ // 
+ // </file> 
++
++#include <stdio.h>
+ #include "socket.h"
+ 
+ #include "new.h"
+@@ -186,7 +188,11 @@
+ #ifndef WIN32
+    int dupfd = ::dup (fd()) ;
+    if (dupfd < 0) {
++#ifdef __FreeBSD__
++      set_errno_(errno) ;
++#else
+       set_errno_(::errno) ;
++#endif
+       perror_("Socket::accept_(sockaddr&,int&): ::dup()") ;
+       return dupfd ;
+    }
diff --git a/www/vrweb/files/patch-ah b/www/vrweb/files/patch-ah
new file mode 100644
index 000000000000..834e89276661
--- /dev/null
+++ b/www/vrweb/files/patch-ah
@@ -0,0 +1,26 @@
+--- src/common/Dispatch/connect.C.orig	Wed Oct 20 19:39:20 1999
++++ src/common/Dispatch/connect.C	Wed Oct 20 19:41:38 1999
+@@ -102,7 +102,11 @@
+        if ((iError=WSAGetLastError()) != WSAEWOULDBLOCK) {
+          cerr << "ConnectRequest::ConnectRequest(): ::connect() code:" << iError<<endl;
+ #else
++#ifdef __FreeBSD__
++       if (errno != EINPROGRESS) {
++#else
+        if (::errno != EINPROGRESS) {
++#endif
+            ::perror ("ConnectRequest::ConnectRequest(): ::connect()") ;
+ #endif
+            HGSOCKCLOSE (socket_) ;
+@@ -154,7 +158,11 @@
+    sockaddr_in that ;
+    int thatlen = sizeof (that) ;
+    if (::getpeername (fd, (sockaddr*)&that, &thatlen) < 0) {
++#ifdef __FreeBSD__
++      if (! (errno==ENOTCONN || errno==ECONNREFUSED))
++#else
+       if (! (::errno==ENOTCONN || ::errno==ECONNREFUSED))
++#endif
+          ::perror ("ConnectRequest::outputReady(): ::getpeername()") ;
+       callback->connectError (a) ;
+       ::close (fd) ;
diff --git a/www/vrweb/files/patch-ai b/www/vrweb/files/patch-ai
new file mode 100644
index 000000000000..7e9267d67f41
--- /dev/null
+++ b/www/vrweb/files/patch-ai
@@ -0,0 +1,14 @@
+--- src/common/Dispatch/dispatcher.C.orig	Wed Oct 20 19:42:05 1999
++++ src/common/Dispatch/dispatcher.C	Wed Oct 20 19:42:42 1999
+@@ -359,7 +359,11 @@
+    DEBUGNL ("Dispatcher::waitForChild()") ;
+    pid_t pid ; 
+    int status ;
++#ifdef __FreeBSD__
++   while ((pid = ::waitpid (-1, &status, WNOHANG)) > 0  ||  (pid < 0 && errno == EINTR)) {
++#else
+    while ((pid = ::waitpid (-1, &status, WNOHANG)) > 0  ||  (pid < 0 && ::errno == EINTR)) {
++#endif
+       DEBUGNL ("Dispatcher::waitForChild(): pid: "<<pid) ;
+       DChildHandler lookup (pid) ;
+       int pos ;
diff --git a/www/vrweb/files/patch-aj b/www/vrweb/files/patch-aj
new file mode 100644
index 000000000000..f08eb6070c05
--- /dev/null
+++ b/www/vrweb/files/patch-aj
@@ -0,0 +1,23 @@
+--- src/common/Dispatch/rpcbuf.C.orig	Wed Oct 20 19:42:58 1999
++++ src/common/Dispatch/rpcbuf.C	Wed Oct 20 19:44:12 1999
+@@ -977,12 +977,20 @@
+ // jfasch 24 Apr 1995
+ int rpcbuf :: rpc_read (int fd, char* buf, int len) {
+    int nread ;
++#ifdef __FreeBSD__
++   while ((nread = ::read (fd, buf, len)) < 0  &&  errno == EINTR) ;
++#else
+    while ((nread = ::read (fd, buf, len)) < 0  &&  ::errno == EINTR) ;
++#endif
+    return nread ;
+ }
+ int rpcbuf :: rpc_write (int fd, const char* buf, int len) {
+    int nwritten ;
++#ifdef __FreeBSD__
++   while ((nwritten = ::write (fd, buf, len)) < 0  &&  errno == EINTR) ;
++#else
+    while ((nwritten = ::write (fd, buf, len)) < 0  &&  ::errno == EINTR) ;
++#endif
+    return nwritten ;
+ }
+ #endif