Lots of fixes (bad code in a lot of places) to make this compile and work

6 files changed, 192 insertions, 75 deletions

diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile
index af56d05c052..601b23ea355 100644
--- a/parallel/glunix/Makefile
+++ b/parallel/glunix/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2003/03/29 12:42:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2003/03/31 03:46:29 jmc Exp $
 
 DISTNAME=	glunix-release-1-0a
 PKGNAME=	glunix-1.0a
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}
 CATEGORIES=	parallel
 MASTER_SITES=	http://now.cs.berkeley.edu/Glunix/ \
@@ -28,11 +29,16 @@ NOW_ROOT=	${LOCALBASE}/now
 MESSAGE_SUBST+=	NOW_ROOT=${NOW_ROOT}
 
 .if (${MACHINE} == "i386")
-FLAGS= "-m486 -DL_ENDIAN"
+FLAGS=-m486
+.endif
+
+.include "../../mk/endian.mk"
+.if (${MACHINE_ENDIAN} == "little")
+FLAGS+=-DL_ENDIAN
 .endif
 
 MAKE_ENV+= OPSYS=${OPSYS} ARCH=${MACHINE_ARCH} NOW_ROOT=${NOW_ROOT}
-MAKE_ENV+= PORTSDIR=${PKGDIR} WRKDIR=${WRKDIR} FLAGS=${FLAGS}
+MAKE_ENV+= PORTSDIR=${PKGDIR} WRKDIR=${WRKDIR} FLAGS="${FLAGS}"
 MAKE_ENV+= SSH=${SSH}
 
 SCRIPTS_ENV+= ARCH=${MACHINE_ARCH} RM=${RM} NOW_ROOT=${NOW_ROOT}
@@ -63,7 +69,7 @@ post-patch:
 			${MV} -f $$f $$f.input &&			\
 			${SED} -e 's|%%%NOW_ROOT%%%|${NOW_ROOT}|' $$f.input > $$f; \
 		done;							\
-		${MV} -f glush/Makefile glush/Makefile.input &&		\
+		${MV} -f progs/glush/Makefile progs/glush/Makefile.input && \
 		${SED} -e 's|%%%PLAT%%%|${MACHINE_ARCH}-NetBSD-tcp|'	\
 			progs/glush/Makefile.input > progs/glush/Makefile
 
@@ -90,6 +96,8 @@ pre-install:
 	fi;
 
 post-install:
+	@${LN} -s ../../now/lib/libglunix.so.1.0 ${PREFIX}/now/lib/libglunix.so.1
+	@${LN} -s ../../now/lib/libglunix.so.1.0 ${PREFIX}/now/lib/libglunix.so
 	@${TOUCH} ${NOW_ROOT}/lib/${MACHINE_ARCH}-${OPSYS}-tcp/.keepme
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/parallel/glunix/distinfo b/parallel/glunix/distinfo
index 309b6f189e2..4be806914b4 100644
--- a/parallel/glunix/distinfo
+++ b/parallel/glunix/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 15:22:46 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/03/31 03:46:29 jmc Exp $
 
 SHA1 (glunix-release-1-0a.tar.gz) = 8c69f5252e00fc4143a088c9b555b5e0c5b350f8
 Size (glunix-release-1-0a.tar.gz) = 1777769 bytes
 SHA1 (makedepend.tar.gz) = 9bbe5fb63d44860114fe4cbc57dbd37cb22aa725
 Size (makedepend.tar.gz) = 29283 bytes
 SHA1 (patch-aa) = a4f4e284ba4a473bc37640e6d5d71441613e97ac
-SHA1 (patch-ab) = 62f9b405aec0a54a39e54da0743357dba5f52ee4
+SHA1 (patch-ab) = 3632ab83e21db22f113c9aeb3a07493076c65303
 SHA1 (patch-ac) = eaa45b9caf6ecec7cd0184c680dc68633120a2a8
 SHA1 (patch-ad) = b0f7cda045433941342731322e05514842e52f4c
 SHA1 (patch-ae) = 4f516f1e53b07105190d3f07495a7dd5c6888ac7
@@ -13,11 +13,11 @@ SHA1 (patch-af) = 5a1b33f647a228858e4e68a94b392e1e2d9b0696
 SHA1 (patch-ag) = 9f84ce0260db01001145d7ca58dcec441736deb1
 SHA1 (patch-ah) = ae0c9f0bbca261922677c0b132a064df059bc9cf
 SHA1 (patch-ai) = d42fa3494eb4c46c334cdd521a64b80e04374dde
-SHA1 (patch-aj) = 4719182688bceeecc0aa42b8e485069bb20cf0da
+SHA1 (patch-aj) = 515c00a86ea1eb8ed9eb402736b6f3270745fec3
 SHA1 (patch-ak) = c20e4c7eb3a93636d30eb06e222c7b3b3584e759
 SHA1 (patch-al) = 275dab35fbcb5a65e1479b95075f2295de961893
 SHA1 (patch-am) = 5640d04dccae4633384c2f04f5e96f15e9919a0f
-SHA1 (patch-an) = e668be1a71c6c2ed0182c2b9d551520644ca2922
+SHA1 (patch-an) = 94013f2f31f1f6687f7696fc90e3de3e0b568b14
 SHA1 (patch-ao) = 842e72bb67ed545429fe33580aab772a0b9247a5
 SHA1 (patch-ap) = d562609a3c3f6d6fe7ccac5eca86a548ad0ec0bf
 SHA1 (patch-aq) = 3f10b837c6b32c59029996f6c79ff07765c930a5
@@ -62,3 +62,4 @@ SHA1 (patch-cc) = 41ab0ad1725e4f3c5121094c392f1340cacf4410
 SHA1 (patch-cd) = 47a673f5e13051399aa2460b767c491774aa42b2
 SHA1 (patch-ce) = b6e1d47e1c1cb326a35808dae36645a6cddbc2fd
 SHA1 (patch-cf) = a1ed01f0ee10975c7be8a695d92c808d9f6bd9f2
+SHA1 (patch-cg) = ebc1351a979be92b44ca7c75f71f532833a437e4
diff --git a/parallel/glunix/patches/patch-ab b/parallel/glunix/patches/patch-ab
index 835681758c9..3221bc35186 100644
--- a/parallel/glunix/patches/patch-ab
+++ b/parallel/glunix/patches/patch-ab
@@ -1,19 +1,29 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
+$NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
 
---- glunix/src/comm/ccomm_net.cc.orig	Wed Oct 15 12:24:52 1997
-+++ glunix/src/comm/ccomm_net.cc	Thu Apr  2 08:54:18 1998
-@@ -75,3 +75,4 @@
+--- glunix/src/comm/ccomm_net.cc.orig	Wed Oct 15 19:24:52 1997
++++ glunix/src/comm/ccomm_net.cc	Sun Mar 30 21:48:41 2003
+@@ -73,7 +73,8 @@
+ #include <netinet/tcp.h>
+ #include <sys/socket.h>
  #include <unistd.h>
 -#include <sys/systeminfo.h>
 +/*#include <sys/systeminfo.h>*/
 +#include <sys/uio.h>
  
-@@ -260,3 +261,3 @@
+ #include "glib/types.h"
+ #include "cdebug.h"
+@@ -258,7 +259,7 @@
+ 
+     h = gethostbyname(hostName);
      if (!h) {
 -	DE("Cannot resolve host name: %s\n", strerror(errno));
 +	DE("Cannot resolve host name: %s %s\n",hostName, strerror(errno));
  	// BUGBUG set error code
-@@ -330,10 +331,11 @@
+ 	return 0;
+     }
+@@ -328,14 +329,15 @@
+     }
+ 
      // Get my IP address
 -    if (sysinfo(SI_HOSTNAME, hostName, sizeof(hostName)-1) < 0) {
 -	DE("sysinfo(SI_HOSTNAME): %s\n", strerror(errno));
@@ -31,7 +41,20 @@ $NetBSD: patch-ab,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
 -	DE("Cannot resolve host name: %s\n", strerror(errno));
 +	DE("Cannot resolve host name: %s %s\n",hostName, strerror(errno));
  	// BUGBUG error code
-@@ -378,3 +380,7 @@
+ 	*ipPtr = 0;
+ 	return False;
+@@ -365,7 +367,7 @@
+ Comm_SocketGetPort(int sock, int *port)
+ {
+     struct sockaddr_in  s;
+-    int len;
++    socklen_t len;
+ 
+     ASSERT(port != NULL);
+ 
+@@ -376,7 +378,11 @@
+ 	return False;
+     }
      // use ntohs to convert it back to host order for pc's
 +#ifdef L_ENDIAN
 +    *port = s.sin_port;
@@ -39,7 +62,29 @@ $NetBSD: patch-ab,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
      *port = ntohs(s.sin_port);
 +#endif
      return True;
-@@ -437,4 +443,7 @@
+ }
+ 
+@@ -397,7 +403,7 @@
+ Comm_SocketGetPeerPort(int sock)
+ {
+     struct sockaddr_in  s;
+-    int                 len;
++    socklen_t           len;
+ 
+     len = sizeof(struct sockaddr_in);
+     if (getpeername(sock, (struct sockaddr *)&s, &len)
+@@ -425,7 +431,7 @@
+ Comm_SocketGetPeerIpAddr(int sock, uint *ipAddrPtr)
+ {
+     struct sockaddr_in  s;
+-    int                 len;
++    socklen_t           len;
+ 
+     ASSERT(ipAddrPtr != NULL);
+     *ipAddrPtr = 0;
+@@ -435,8 +441,11 @@
+ 	DE("getpeername: %s\n", strerror(errno));
+ 	return False;
      }
 -
 +#ifdef L_ENDIAN
@@ -48,7 +93,11 @@ $NetBSD: patch-ab,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
      *ipAddrPtr = ntohl(s.sin_addr.s_addr);
 +#endif
      return True;
-@@ -530,4 +539,9 @@
+ }
+ 
+@@ -528,8 +537,13 @@
+ 
+     // Bind the socket to a well-known port
      s.sin_family = AF_INET;
 +#ifdef L_ENDIAN
 +    s.sin_port = port;
@@ -58,7 +107,11 @@ $NetBSD: patch-ab,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
      s.sin_addr.s_addr = htonl(INADDR_ANY);
 +#endif
  
-@@ -639,5 +653,9 @@
+     val = bind(sock, (struct sockaddr *) &s, sizeof(s));
+     if (val < 0) {
+@@ -637,9 +651,13 @@
+ 
+     // Now connect to the requested host
      s.sin_family = AF_INET ;
 +#ifdef L_ENDIAN
 +    s.sin_port = port;
@@ -69,3 +122,50 @@ $NetBSD: patch-ab,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
 -
 +#endif
      if (connect(sock, (struct sockaddr *) &s, sizeof(s)) < 0) {
+ 	if (errno == EINTR) {
+ 	    while(1) {
+@@ -700,7 +718,7 @@
+ {
+     struct sockaddr_in  s;
+     int                 fd;
+-    int                 addrLen;
++    socklen_t           addrLen;
+ 
+     ASSERT(newFd != NULL);
+     *newFd = -1;
+@@ -754,7 +772,7 @@
+     ASSERT(bufLen > 0);
+ 
+     errno = 0; // BUGBUG, we should do this for ALL related funcs
+-    for (; bufLen; bufLen -= val, bufPtr += val) {
++    for (; bufLen; bufLen -= val, (char *)bufPtr += val) {
+ 	val = write(sock, (const char *)bufPtr, bufLen);
+ 
+ 	writeErrno = errno;
+@@ -880,7 +898,7 @@
+ 		vecLen--;
+ 	    } else {
+ 		vecPtr[0].iov_len -= val;
+-		vecPtr[0].iov_base += val;
++		(char *)vecPtr[0].iov_base += val;
+ 		break;
+ 	    }
+ 	}
+@@ -915,7 +933,7 @@
+     ASSERT(bufLen > 0);
+ 
+     errno = 0; // BUGBUG, we should do this for ALL related funcs
+-    for (; bufLen; bufLen -= val, bufPtr += val) {
++    for (; bufLen; bufLen -= val, (char *)bufPtr += val) {
+ 	val = read(sock, (char *)bufPtr, bufLen);
+ 	readErrno = errno;
+ 	D9("Read from sock %d, bufPtr %08x, bufLen %d, bytes %d\n",
+@@ -1045,7 +1063,7 @@
+ 		D3("Read fewer bytes than asked for:%d < %d\n",
+ 		   totRead, vecPtr[currVec].iov_len);
+ 		vecPtr[currVec].iov_len -= val;
+-		vecPtr[currVec].iov_base += val;
++		(char *)vecPtr[currVec].iov_base += val;
+ 		break;
+ 	    }
+ 	}
diff --git a/parallel/glunix/patches/patch-aj b/parallel/glunix/patches/patch-aj
index 3f6a0cafa9c..6e3e6c5acca 100644
--- a/parallel/glunix/patches/patch-aj
+++ b/parallel/glunix/patches/patch-aj
@@ -1,14 +1,15 @@
-$NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
+$NetBSD: patch-aj,v 1.4 2003/03/31 03:46:30 jmc Exp $
 
---- glunix/src/idle/didle_sysinfo.cc.orig	Thu Sep 18 21:04:55 1997
-+++ glunix/src/idle/didle_sysinfo.cc	Sat Jun 17 01:07:46 2000
-@@ -95,14 +95,33 @@
+--- glunix/src/idle/didle_sysinfo.cc.orig	Thu Sep 18 19:04:55 1997
++++ glunix/src/idle/didle_sysinfo.cc	Sun Mar 30 21:52:53 2003
+@@ -95,14 +95,34 @@
  #include <kvm.h>
  #include <nlist.h>
  #include <stdio.h>
 +
 +#ifdef __NetBSD__
 +#include <stdlib.h>
++#include <string.h>
 +#include <sys/time.h>
 +#include <sys/param.h>
 +#include <sys/proc.h>
@@ -36,7 +37,7 @@ $NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
  
  #include "clist.h"
  #include "cidle.h"
-@@ -120,12 +139,51 @@
+@@ -120,12 +140,51 @@
  
  #define LOADDOUBLE(la) ((double)(la) / FSCALE)
  #define HASH(x) ((x) >> 1)
@@ -89,7 +90,7 @@ $NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
  /* definitions for indices in the nlist array */
  #define X_AVENRUN		 0
  #define X_MPID			 1
-@@ -165,11 +223,11 @@
+@@ -165,11 +224,11 @@
  
  // These are offsets into kmem for the stats we need
  static ulong avenrunOffset, availrmemOffset, anoninfoOffset, swapfsOffset;
@@ -103,7 +104,7 @@ $NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
  static int cpuStates[NUM_CPUSTATES];
  static int memoryStats[5];
  static char *cpuStateNames[] =
-@@ -237,6 +295,45 @@
+@@ -237,6 +296,45 @@
   *
   * Side effects:
   *****************************************************************************/
@@ -149,7 +150,7 @@ $NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
  Bool
  Idle_InitializeSysinfo(void)
  {
-@@ -301,7 +398,7 @@
+@@ -301,7 +399,7 @@
  
      return True;
  }
@@ -158,7 +159,7 @@ $NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
  /******************************************************************************
   * Idle_CleanupSysinfo --
   *    Description of purpose and function of the procedure
-@@ -333,18 +430,30 @@
+@@ -333,18 +431,30 @@
   *
   * Side effects:
   *****************************************************************************/
@@ -190,7 +191,7 @@ $NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
  	    /* Has this pid been recycled?  Are we hitting a very old process?
  	       If so, then reset the entry */
  	    if (usage < candidate->cpuUsage) {
-@@ -353,7 +462,11 @@
+@@ -353,7 +463,11 @@
  	    return candidate;
  	}
  	if (candidate->pid == -1) {
@@ -202,7 +203,7 @@ $NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
  	    candidate->cpuUsage = 0;
  	    return candidate;
  	}
-@@ -379,10 +492,17 @@
+@@ -379,10 +493,17 @@
   *
   * Side effects:
   *****************************************************************************/
@@ -220,7 +221,7 @@ $NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
      ASSERT(entry != NULL);
      entry->cpuUsage = usage;
  }
-@@ -408,12 +528,24 @@
+@@ -408,12 +529,24 @@
  void
  Idle_GetSysInfo(Idle_Load *total, Idle_Load *seq, List_List *glunixProcs)
  {
@@ -245,7 +246,7 @@ $NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
      static struct timeval  lastTime = {0, 0};
      struct timeval         currTime;
      double                 alpha, beta;
-@@ -459,6 +591,33 @@
+@@ -459,6 +592,33 @@
      vmInUse[TOTAL] = 0; vmInUse[SEQUENTIAL] = 0;
      cpuUsage[TOTAL] = 0; cpuUsage[SEQUENTIAL] = 0;
      numProcs = 0;
@@ -279,7 +280,7 @@ $NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
      rewinddir(procdir);
      
      while ((direntp = readdir(procdir)) != 0) {
-@@ -493,6 +652,7 @@
+@@ -493,6 +653,7 @@
  	(void) close(fd);
  	numProcs++;
      }
@@ -287,7 +288,7 @@ $NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
      total->mem = activeMemory[TOTAL];
      total->cpu = cpuUsage[TOTAL];
      seq->mem = activeMemory[SEQUENTIAL];
-@@ -503,10 +663,21 @@
+@@ -503,10 +664,21 @@
  void
  Idle_GetSystemInfo(Idle_SystemLoad *sysLoad)
  {
@@ -297,13 +298,12 @@ $NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
      long     avenrun[3];
 +    struct anoninfo anoninfo;
      int      ani_max, ani_resv, availrmem, swapfs_minfree;
--    int      i;
 +#else
-+    int i;
+     int      i;
 +    double  avenrun[3];
 +    int mib[2];
 +    struct vmtotal total;
-+    int sizeofvmtotal;
++    size_t sizeofvmtotal;
 +    struct  swapent *sep;
 +    int     totalsize, size, totalinuse, inuse, ncounted;
 +    int     rnswap, nswap;
@@ -311,7 +311,7 @@ $NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
  
      if (kd == NULL) {
  	sysLoad->loadAvg[0] = 0;
-@@ -515,7 +686,48 @@
+@@ -515,7 +687,48 @@
  	sysLoad->memory = 0;
  	return;
      }
@@ -360,7 +360,7 @@ $NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
      /* get load average array */
      ReadKernelData(avenrunOffset, (char *) avenrun, sizeof (avenrun));
      //
-@@ -539,6 +751,7 @@
+@@ -539,6 +752,7 @@
      sysLoad->memory = PAGETOK(MAX(ani_max - ani_resv, 0) +
  			      availrmem - swapfs_minfree);
  
diff --git a/parallel/glunix/patches/patch-an b/parallel/glunix/patches/patch-an
index 6f71a9eabfe..652407c5063 100644
--- a/parallel/glunix/patches/patch-an
+++ b/parallel/glunix/patches/patch-an
@@ -1,14 +1,20 @@
-$NetBSD: patch-an,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-an,v 1.2 2003/03/31 03:46:30 jmc Exp $
 
---- glunix/src/rexec/lrexec.cc~	Thu Oct  2 12:34:06 1997
-+++ glunix/src/rexec/lrexec.cc	Fri Feb 27 17:47:23 1998
-@@ -295,2 +295,5 @@
+--- glunix/src/rexec/lrexec.cc.orig	Thu Oct  2 19:34:06 1997
++++ glunix/src/rexec/lrexec.cc	Sun Mar 30 21:55:03 2003
+@@ -293,6 +293,9 @@
+ #include <termios.h>
+ #include <unistd.h>
  #include <limits.h>
 +#ifdef __NetBSD__
 +#include <sys/ioctl.h>
 +#endif
  
-@@ -377,5 +380,4 @@
+ #include "glib/types.h"
+ #include "glib.h"
+@@ -375,39 +378,30 @@
+ {
+     struct termios buf;
  
 -    (void) ioctl(0, TCGETS, (char *)&saveTermios);
 -
@@ -16,7 +22,11 @@ $NetBSD: patch-an,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
 +#ifdef __NetBSD__
 +        while(tcgetattr(STDIN_FILENO, &saveTermios) == -1) {
  	if(errno == EINTR) {
-@@ -386,9 +388,12 @@
+ 	    continue;
+ 	} else {
+ 	    D1("tcgetattr() failed: %s\n", strerror(errno));
+-	    return False;
++	    return;
  	}
 -    }*/
 -
@@ -30,10 +40,9 @@ $NetBSD: patch-an,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
 +    /*
 +      if(ioctl(STDIN_FILENO, TIOCGWINSZ, (char *) windowSize) == -1) {
  	return False;
--    }*/
-+	}*/
+     }*/
  
-@@ -396,16 +401,5 @@
+     buf = saveTermios;
  
 -    /**/
 -
@@ -52,38 +61,22 @@ $NetBSD: patch-an,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
 -//  buf.c_oflag &= ~(OPOST); on non-ultrasparcs, this loses CR's
 +    buf.c_oflag &= ~(OPOST); /*on non-ultrasparcs, this loses CR's*/
      buf.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG);
-@@ -418,20 +412,26 @@
-     while(tcsetattr(STDIN_FILENO, TCSAFLUSH, &buf) == -1) {
--	if(errno == EINTR) {
-+      if(errno == EINTR) {
-+	continue;
-+      } else {
-+	D1("tcsetattr(): %s\n", strerror(errno));
-+
-+	while(tcsetattr(STDIN_FILENO, TCSAFLUSH, &saveTermios) == -1) {
-+	  if(errno == EINTR) {
- 	    continue;
--	} else {
-+	  } else {
- 	    D1("tcsetattr(): %s\n", strerror(errno));
--
--	    while(tcsetattr(STDIN_FILENO, TCSAFLUSH, &saveTermios) == -1) {
--		if(errno == EINTR) {
--		    continue;
--		} else {
--		    D1("tcsetattr(): %s\n", strerror(errno));
+     buf.c_cflag &= ~(CSIZE | PARENB);
+     buf.c_cflag |= CS8;
+@@ -426,14 +420,20 @@
+ 		    continue;
+ 		} else {
+ 		    D1("tcsetattr(): %s\n", strerror(errno));
 -		    return False;
--		}
--	    }
--	    
- 	    return False;
-+	  }
++	    return;
+ 		}
+ 	    }
+ 	    
+-	    return False;
++	return;
  	}
 -    }*/
 -
-+	    
-+	return False;
-+      }
 +    }
 +#else
 +	buf.c_iflag &= ~(INLCR|IGNCR|ICRNL|IUCLC|IXON);
@@ -93,3 +86,5 @@ $NetBSD: patch-an,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
 +	(void) ioctl(0, TCSETSF, (char *)&buf);
 +#endif
      Comm_SetLineBuffering(False);
+    
+     return;
diff --git a/parallel/glunix/patches/patch-cg b/parallel/glunix/patches/patch-cg
new file mode 100644
index 00000000000..9a175ecf53b
--- /dev/null
+++ b/parallel/glunix/patches/patch-cg
@@ -0,0 +1,13 @@
+$NetBSD: patch-cg,v 1.1 2003/03/31 03:46:30 jmc Exp $
+
+--- progs/tools/mhtml2html.pl.orig	Sun Mar 30 22:00:17 2003
++++ progs/tools/mhtml2html.pl	Sun Mar 30 22:00:21 2003
+@@ -68,7 +68,7 @@
+ #    print "Line cache is: \"$line_cache\"\n";
+ 
+ #    $line_cache =~ s/^\s+//;
+-    undef $1;
++#    undef $1;
+     # First yank the next token out of the line_cache
+     $char = substr($line_cache, 0, 1);
+     if ($char eq "<") {