uodate to 4.1.3

changes:
Fixes to several problems that quickly arose with 4.1.2
---------------------------------------------------
- Dependencies of source files on built sources caused build to stop.
It would continue correctly after restarting, but by making the objects
dependent instead we made it work in one pass.
- References in _regstream.c.  Missing references/deletes in _regstream.c
and steamline.c caused objects to be really deleted before their time.
Problem appeared in ThunderStreamlines example.  Did this ever work?
- Not enough memory allocated for buffer in parse.c.
- Needed to pass in class_srcdir value to invokation of class script
in libdx/local.mk
- Include net2c in distribution
- Correctly free search_for in Browser.C.  Proper behavior dependent on
compile-time definitions.
- Not enoucgh memory allocated for type-in string in GARApplication.C.
Caused segfaults in prompter.

14 files changed, 173 insertions, 129 deletions

diff --git a/graphics/dx/patches/patch-aa b/graphics/dx/patches/patch-aa
index f8056aa102a..5362909676a 100644
--- a/graphics/dx/patches/patch-aa
+++ b/graphics/dx/patches/patch-aa
@@ -1,12 +1,30 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/10/01 11:23:15 drochner Exp $
---- src/exec/libdx/message.c.orig	Sun Sep 26 22:04:06 1999
-+++ src/exec/libdx/message.c	Sun Sep 26 22:04:26 1999
-@@ -271,7 +271,7 @@
- DXPrintError(char *s)
- {
-     extern int sys_nerr;
--#if !defined(linux) && !defined(freebsd)
-+#if !defined(linux) && !defined(freebsd) && !defined(__NetBSD__)
-     extern char *sys_errlist[];
+$NetBSD: patch-aa,v 1.2 2002/02/05 22:23:32 drochner Exp $
+
+--- src/exec/libdx/message.c.orig	Tue Feb  5 12:56:40 2002
++++ src/exec/libdx/message.c	Tue Feb  5 13:05:08 2002
+@@ -21,20 +21,18 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#if defined(HAVE_SYS_ERRNO_H)
+-#include <sys/errno.h>
+-#endif
+-
+ #if defined(HAVE_ERRNO_H)
+ #include <errno.h>
++#elif defined(HAVE_SYS_ERRNO_H)
++#include <sys/errno.h>
  #endif
-     char *msg, *errnomsg;
+ 
++#if !defined(HAVE_SYS_ERRLIST)
+ #if defined(HAVE__SYS_ERRLIST)
+ #define sys_errlist _sys_errlist
+-#endif
+-
+-#if ! (defined(HAVE_SYS_ERRLIST) || defined(HAVE__SYS_ERRLIST))
++#else
+ extern char *sys_errlist[];
++#endif
+ #endif
+ 
+ #if defined(HAVE_IO_H)
diff --git a/graphics/dx/patches/patch-ab b/graphics/dx/patches/patch-ab
index e3943fa1958..19485b3d3dc 100644
--- a/graphics/dx/patches/patch-ab
+++ b/graphics/dx/patches/patch-ab
@@ -1,28 +1,17 @@
-$NetBSD: patch-ab,v 1.3 2001/09/12 21:09:04 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2002/02/05 22:23:32 drochner Exp $
 
---- configure.orig	Fri Mar 31 15:07:21 2000
-+++ configure
-@@ -1257,6 +1257,9 @@
- 	if test $unameS = "FreeBSD" ; then
- 	    ARCH=freebsd
- 	fi
-+	if test $unameS = "NetBSD" ; then
-+	    ARCH=netbsd
-+	fi
- 	if test `echo $unameS | tr A-Z a-z | sed "s/^.*cygwin.*$/yes/"` = "yes" ; then
- 	    ARCH=cygwin
- 	fi
-@@ -1269,9 +1272,6 @@
- 	if test $unameS = "AIX" ; then
- 	    ARCH=ibm6000
- 	fi
--	if test $unameM = "alpha" ; then
--	    ARCH=alphax
--	fi
- 	if test $unameS = "HP-UX" ; then
- 	    ARCH=hp700
- 	fi
-@@ -3719,6 +3719,7 @@
+--- configure.orig	Thu Jun  7 17:09:59 2001
++++ configure	Tue Feb  5 12:18:11 2002
+@@ -1330,6 +1330,8 @@
+ 	    ac_cv_dx_arch=unknown
+ 	    if test $unameS = "FreeBSD" ; then
+ 		ac_cv_dx_arch=freebsd
++	    elif test $unameS = "NetBSD" ; then
++		ac_cv_dx_arch=netbsd
+ 	    elif test `echo $unameS | tr A-Z a-z | sed "s/^.*cygwin.*$/yes/"` = "yes" ; then
+ 		ac_cv_dx_arch=cygwin
+ 	    elif test $unameS = "Linux" ; then
+@@ -4021,6 +4023,7 @@
    ac_cv_have_x="have_x=yes \
  		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
    echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
diff --git a/graphics/dx/patches/patch-ac b/graphics/dx/patches/patch-ac
index 08e85416d0b..800815f3cd4 100644
--- a/graphics/dx/patches/patch-ac
+++ b/graphics/dx/patches/patch-ac
@@ -1,6 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/10/01 11:23:15 drochner Exp $
---- bin/dxworker.in.orig	Wed Aug  4 22:03:37 1999
-+++ bin/dxworker.in	Mon Sep 27 19:42:26 1999
+$NetBSD: patch-ac,v 1.2 2002/02/05 22:23:32 drochner Exp $
+
+--- bin/dxworker.in.orig	Tue May  8 17:01:28 2001
++++ bin/dxworker.in	Tue Feb  5 12:19:49 2002
 @@ -29,6 +29,12 @@
  
      breaksw
@@ -14,11 +15,11 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/10/01 11:23:15 drochner Exp $
    case AIX*:
      set exarch=ibm6000
      set uiarch=ibm6000
-@@ -1452,6 +1458,7 @@
+@@ -1464,6 +1470,7 @@
    case alphax:
    case linux:
    case freebsd:
 +  case netbsd:
+   case macos:
      breaksw
    
-   default:
diff --git a/graphics/dx/patches/patch-ad b/graphics/dx/patches/patch-ad
index 4b4e18a85bd..32615eb1989 100644
--- a/graphics/dx/patches/patch-ad
+++ b/graphics/dx/patches/patch-ad
@@ -1,12 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/10/01 11:23:15 drochner Exp $
---- include/dx/arch.h.orig	Sun Sep 26 22:27:58 1999
-+++ include/dx/arch.h	Sun Sep 26 22:28:20 1999
-@@ -127,7 +127,7 @@
- 
- #endif
- 
+$NetBSD: patch-ad,v 1.2 2002/02/05 22:23:32 drochner Exp $
+
+--- include/dx/arch.h.orig	Mon May 21 07:06:57 2001
++++ include/dx/arch.h	Tue Feb  5 12:21:36 2002
+@@ -175,7 +175,7 @@
+ /* 
+  * FreeBSD (and probably NetBSD and OpenBSD)
+  */
 -#if defined(freebsd)
 +#if defined(freebsd) || defined(__NetBSD__)
  
  #undef F_CHAR_READY
- #define F_CHAR_READY(fp) ((fp)->_r > 0)
+ #define F_CHAR_READY(fp) ((fp)->_r > 0 || (fp)->_ub._base)
diff --git a/graphics/dx/patches/patch-ae b/graphics/dx/patches/patch-ae
index 16f748498de..e589acd1f29 100644
--- a/graphics/dx/patches/patch-ae
+++ b/graphics/dx/patches/patch-ae
@@ -1,30 +1,49 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/10/01 11:23:15 drochner Exp $
---- src/exec/dpexec/loader.c.orig	Sat Jun  5 22:25:38 1999
-+++ src/exec/dpexec/loader.c	Mon Sep 27 00:27:49 1999
-@@ -85,7 +85,7 @@
+$NetBSD: patch-ae,v 1.2 2002/02/05 22:23:32 drochner Exp $
+
+--- src/exec/dpexec/loader.c.orig	Mon May 21 07:06:58 2001
++++ src/exec/dpexec/loader.c	Tue Feb  5 13:22:41 2002
+@@ -38,21 +38,19 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#if defined(HAVE_SYS_ERRNO_H)
+-#include <sys/errno.h>
+-#endif
+-
+ #if defined(HAVE_ERRNO_H)
+ #include <errno.h>
++#elif defined(HAVE_SYS_ERRNO_H)
++#include <sys/errno.h>
+ #endif
+ 
++#if !defined(HAVE_SYS_ERRLIST)
+ #if defined(HAVE__SYS_ERRLIST) 
+ #define sys_errlist _sys_errlist
+-#endif
+-
+-#if ! (defined(HAVE_SYS_ERRLIST) || defined(HAVE__SYS_ERRLIST))
++#else
+ extern char *sys_errlist[];
+ #endif
++#endif
+ 
+ 
+ #include <sys/stat.h> 
+@@ -88,7 +86,7 @@
  #endif /* hp700 */
  
  
--#if defined(sun4) || defined(solaris) || defined(sgi) || defined(alphax) || defined(aviion) || defined(linux) || defined(cygwin) || defined(freebsd)
-+#if defined(sun4) || defined(solaris) || defined(sgi) || defined(alphax) || defined(aviion) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(__NetBSD__)
+-#if defined(sun4) || defined(solaris) || defined(sgi) || defined(alphax) || defined(aviion) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(macos)
++#if defined(sun4) || defined(solaris) || defined(sgi) || defined(alphax) || defined(aviion) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(macos) || defined(__NetBSD__)
  
  #include <dlfcn.h>
  typedef void *Handle;
-@@ -574,7 +574,7 @@
+@@ -571,7 +569,7 @@
  #endif  /* hp700 */
  
  
--#if defined(sun4) || defined(solaris) || defined(sgi) || defined(alphax) || defined(aviion) || defined(linux) || defined(cygwin) || defined(freebsd)
-+#if defined(sun4) || defined(solaris) || defined(sgi) || defined(alphax) || defined(aviion) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(__NetBSD__)
+-#if defined(sun4) || defined(solaris) || defined(sgi) || defined(alphax) || defined(aviion) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(macos)
++#if defined(sun4) || defined(solaris) || defined(sgi) || defined(alphax) || defined(aviion) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(macos) || defined(__NetBSD__)
  
  
  #define __ROUTINES_DEF
-@@ -852,7 +852,7 @@
-     return ERROR;
- }
- 
--Error DXUnloadObjFile(char *fname)
-+Error DXUnloadObjFile(char *fname, char *envvar)
- {
-     /* the unload routine needs the entry point address, which we
-      * wouldn't need to save unless this is an important function.
diff --git a/graphics/dx/patches/patch-ag b/graphics/dx/patches/patch-ag
deleted file mode 100644
index 4333981f027..00000000000
--- a/graphics/dx/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2000/04/28 15:27:02 drochner Exp $
-
---- src/uipp/dxui/Makefile.in.orig	Wed Apr  5 21:01:39 2000
-+++ src/uipp/dxui/Makefile.in	Wed Apr 12 16:37:34 2000
-@@ -87,7 +87,7 @@
- JDK_CLASSPATH = @JDK_CLASSPATH@
- JINC = @JINC@
- JNI_CFLAGS = @JNI_CFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lcompat
- MAKEINFO = @MAKEINFO@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
diff --git a/graphics/dx/patches/patch-ah b/graphics/dx/patches/patch-ah
deleted file mode 100644
index 87637d3be1d..00000000000
--- a/graphics/dx/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 1999/10/01 11:23:15 drochner Exp $
---- src/uipp/dxuilib/Makefile.in.orig	Mon Sep 27 00:06:55 1999
-+++ src/uipp/dxuilib/Makefile.in	Mon Sep 27 00:06:59 1999
-@@ -2724,7 +2724,7 @@
- 		sed -e 's/$$/",/' > imagemac.txt
- 
- netlex.c: net.lex
--	$(LEX) net.lex
-+	$(LEX) -l net.lex
- 	mv lex.yy.c netlex.c
- 
- netyacc.c: net.yacc netlex.c netyacc.awk
diff --git a/graphics/dx/patches/patch-ai b/graphics/dx/patches/patch-ai
deleted file mode 100644
index c5f573bce9d..00000000000
--- a/graphics/dx/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2000/04/28 15:27:02 drochner Exp $
-
---- src/uipp/prompter/Makefile.in.orig	Wed Apr  5 21:01:44 2000
-+++ src/uipp/prompter/Makefile.in	Wed Apr 12 16:44:29 2000
-@@ -87,7 +87,7 @@
- JDK_CLASSPATH = @JDK_CLASSPATH@
- JINC = @JINC@
- JNI_CFLAGS = @JNI_CFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lcompat
- MAKEINFO = @MAKEINFO@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
diff --git a/graphics/dx/patches/patch-aj b/graphics/dx/patches/patch-aj
index dbcb229dc63..2bd0bd6e026 100644
--- a/graphics/dx/patches/patch-aj
+++ b/graphics/dx/patches/patch-aj
@@ -1,12 +1,13 @@
-$NetBSD: patch-aj,v 1.1.1.1 1999/10/01 11:23:16 drochner Exp $
---- src/uipp/startup/StartupWindow.C.orig	Mon Sep 27 08:11:37 1999
-+++ src/uipp/startup/StartupWindow.C	Mon Sep 27 08:12:04 1999
-@@ -63,7 +63,7 @@
+$NetBSD: patch-aj,v 1.2 2002/02/05 22:23:33 drochner Exp $
+
+--- src/uipp/startup/StartupWindow.C.orig	Tue May  8 17:01:47 2001
++++ src/uipp/startup/StartupWindow.C	Tue Feb  5 12:28:46 2002
+@@ -64,7 +64,7 @@
  // On these platforms, the pipe doesn't work that way so we'll make a
  // polling loop that runs once every few seconds and checks the child pid.
  //
--#if defined(ibm6000) || defined(hp700) || defined(alphax) || defined(sun4) || defined(linux) || defined(cygwin) || defined(freebsd)
-+#if defined(ibm6000) || defined(hp700) || defined(alphax) || defined(sun4) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(__NetBSD__)
+-#if defined(ibm6000) || defined(hp700) || defined(alphax) || defined(sun4) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(macos)
++#if defined(ibm6000) || defined(hp700) || defined(alphax) || defined(sun4) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(macos) || defined(__NetBSD__)
  #define USE_WAIT3 1
  #endif
  
diff --git a/graphics/dx/patches/patch-am b/graphics/dx/patches/patch-am
index d80ebbe52e2..9e83771019b 100644
--- a/graphics/dx/patches/patch-am
+++ b/graphics/dx/patches/patch-am
@@ -1,13 +1,13 @@
-$NetBSD: patch-am,v 1.2 2000/01/31 21:06:38 drochner Exp $
+$NetBSD: patch-am,v 1.3 2002/02/05 22:23:33 drochner Exp $
 
---- src/uipp/dxuilib/PacketIF.C.orig	Sat Jul 31 17:08:32 1999
-+++ src/uipp/dxuilib/PacketIF.C	Sat Jan 29 18:53:56 2000
-@@ -1388,7 +1388,7 @@
+--- src/uipp/dxuilib/PacketIF.C.orig	Tue May  8 17:01:40 2001
++++ src/uipp/dxuilib/PacketIF.C	Tue Feb  5 12:30:34 2002
+@@ -1370,7 +1370,7 @@
      int fd;
      int sts;
      int oldPort;
--#if !defined(linux) && !defined(cygwin) && !defined(freebsd)
-+#if !defined(linux) && !defined(cygwin) && !defined(freebsd) && !defined(__NetBSD__)
+-#if !defined(linux) && !defined(cygwin) && !defined(freebsd) && !defined(macos)
++#if !defined(linux) && !defined(cygwin) && !defined(freebsd) && !defined(macos) && !defined(__NetBSD__)
      extern int errno;
  #endif
      int tries;
diff --git a/graphics/dx/patches/patch-ao b/graphics/dx/patches/patch-ao
deleted file mode 100644
index 2c0c393ee14..00000000000
--- a/graphics/dx/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2001/02/26 19:00:56 wiz Exp $
-
---- src/exec/hwrender/hwInitScreen.c.orig	Mon May 10 17:45:34 1999
-+++ src/exec/hwrender/hwInitScreen.c
-@@ -24,7 +24,7 @@
-  */
- 
- #include <stdio.h>
--#ifdef DXD_WIN
-+#if defined(DXD_WIN) || defined(__NetBSD__)
- #include <signal.h>
- #else
- #include <sys/signal.h>
diff --git a/graphics/dx/patches/patch-aq b/graphics/dx/patches/patch-aq
new file mode 100644
index 00000000000..27afd21cefb
--- /dev/null
+++ b/graphics/dx/patches/patch-aq
@@ -0,0 +1,30 @@
+$NetBSD: patch-aq,v 1.1 2002/02/05 22:23:33 drochner Exp $
+
+--- src/exec/libdx/edfio.c.orig	Tue Feb  5 13:06:47 2002
++++ src/exec/libdx/edfio.c	Tue Feb  5 13:08:55 2002
+@@ -16,20 +16,18 @@
+ #include <stdarg.h>
+ #include <stdlib.h>
+ 
+-#if defined(HAVE_SYS_ERRNO_H)
+-#include <sys/errno.h>
+-#endif
+-
+ #if defined(HAVE_ERRNO_H)
+ #include <errno.h>
++#elif defined(HAVE_SYS_ERRNO_H)
++#include <sys/errno.h>
+ #endif
+ 
++#if !defined(HAVE_SYS_ERRLIST)
+ #if defined(HAVE__SYS_ERRLIST)
+ #define sys_errlist _sys_errlist
+-#endif
+-
+-#if ! (defined(HAVE_SYS_ERRLIST) || defined(HAVE__SYS_ERRLIST))
++#else
+ extern char *sys_errlist[];
++#endif
+ #endif
+ 
+ #if defined(HAVE_SYS_FILE_H)
diff --git a/graphics/dx/patches/patch-ar b/graphics/dx/patches/patch-ar
new file mode 100644
index 00000000000..ed7983724a8
--- /dev/null
+++ b/graphics/dx/patches/patch-ar
@@ -0,0 +1,12 @@
+$NetBSD: patch-ar,v 1.1 2002/02/05 22:23:33 drochner Exp $
+
+--- src/exec/dxmods/socketconnect.c.orig	Tue Feb  5 13:15:07 2002
++++ src/exec/dxmods/socketconnect.c	Tue Feb  5 13:15:35 2002
+@@ -20,7 +20,6 @@
+ 
+ #else
+ 
+-#include <pthread.h>
+ #include <dx/dx.h>
+ 
+ #if defined(HAVE_UNISTD_H)
diff --git a/graphics/dx/patches/patch-as b/graphics/dx/patches/patch-as
new file mode 100644
index 00000000000..b915eb64868
--- /dev/null
+++ b/graphics/dx/patches/patch-as
@@ -0,0 +1,24 @@
+$NetBSD: patch-as,v 1.1 2002/02/05 22:23:33 drochner Exp $
+
+--- src/exec/dpexec/remote.c.orig	Tue Feb  5 15:19:40 2002
++++ src/exec/dpexec/remote.c	Tue Feb  5 15:27:11 2002
+@@ -103,14 +103,18 @@
+ Error ExHostToFQDN( const char host[], char fqdn[MAXHOSTNAMELEN] )
+ {
+     struct hostent *hp, *hp2;
++    void *addr;
+ 
+     hp = gethostbyname(host);
+     if ( hp == NULL || hp->h_addr_list[0] == NULL ) {
+        DXUIMessage("ERROR", "gethostbyname returned error");
+        return ERROR;
+     }
+-    hp2 = gethostbyaddr( hp->h_addr_list[0], sizeof(struct in_addr),
++    addr = malloc(hp->h_length);
++    memcpy(addr, hp->h_addr_list[0], hp->h_length);
++    hp2 = gethostbyaddr(addr, hp->h_length,
+                         AF_INET );
++    free(addr);
+     if ( hp2 == NULL || hp2->h_name == NULL ) {
+        DXUIMessage("ERROR", "gethostbyaddr returned error");
+        return ERROR;