- Update pvm dependency to new version of pvm (3.4.2)

- a few patches to correctly work with the new version of PVM
- Add USE_FORTRAN and remove local selection of the fortran compiler
- Change DEPENDS on xless to RUN_DEPENDS (not used for build)

8 files changed, 116 insertions, 89 deletions

diff --git a/math/scilab/patches/patch-aa b/math/scilab/patches/patch-aa
index 852a713b783..f533a5ad8cf 100644
--- a/math/scilab/patches/patch-aa
+++ b/math/scilab/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 1999/11/23 16:12:40 dmcmahill Exp $
 
---- configure.in.orig	Thu Sep 17 07:44:35 1998
-+++ configure.in	Mon Oct  4 21:52:54 1999
+--- ./configure.in.orig	Thu Sep 17 07:44:35 1998
++++ ./configure.in	Mon Nov 22 19:55:08 1999
 @@ -684,4 +684,108 @@
      MAKEFILE_TARGET=Makefile.gcwin32
      ;;
@@ -59,13 +59,13 @@ $NetBSD: patch-aa,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $
 +       AC_MSG_ERROR([Unable to configure: Fortran compiler f2c-f77 not found])
 +     fi
 +   else         
-+     AC_CHECK_PROGS(F77,f77 f2c-f77,no)
++     AC_CHECK_PROGS(F77,"${FC}" f77 f2c-f77,no)
 +     if test "$F77" = no; then
 +       AC_MSG_ERROR([Unable to configure: Fortran, f77 or f2c-f77, compiler not found])
 +     fi
 +   fi
 + 
-+   FC=$F77
++   FC="$F77"
 +   FC_OPTIONS='-O2'
 +   FC_LDFLAGS="-Wl,-R${X11BASE}/lib"
 +   FC_PICFLAGS='-fPIC'
@@ -121,7 +121,7 @@ $NetBSD: patch-aa,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $
 +
  ##################
  ## termcap library
-@@ -883,20 +992,38 @@
+@@ -883,19 +992,19 @@
  if test "$with_pvm" != no; then
  
 -AC_CACHE_CHECK("for PVM architecture",ac_cv_PVM_arch,
@@ -131,44 +131,28 @@ $NetBSD: patch-aa,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $
 -if test "$ac_cv_PVM_arch" = UNKNOWN; then
 -  AC_MSG_WARN("PVM unable to find architecture: I will not use PVM")
 -else
-+case "$host" in
-+  *-*-netbsd*)
-+  ## with NetBSD, use the version of pvm3 which is part of the package collection
-+  AC_MSG_CHECKING("for PVM architecture")
-+  AC_MSG_RESULT("NETBSD")
-   AC_DEFINE(WITH_PVM)
+-  AC_DEFINE(WITH_PVM)
 -  PVMARCH="$ac_cv_PVM_arch"
 -  PVMGLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libgpvm3.a"
 -  PVMLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libpvm3.a"
-+  PVMARCH=NETBSD
-+  PVMLIB=${LOCALBASE}/lib/libpvm3.a
-+  PVMGLIB=${LOCALBASE}/lib/libgpvm3.a
-   PVMSCIDIR=pvm
-   PVMSCILIB=libs/pvm.a
+-  PVMSCIDIR=pvm
+-  PVMSCILIB=libs/pvm.a
 -  PVMTARGET=scilex-lib
 -fi
-+  PVMTARGET=pvm-no-build
-+  ;;
-+
-+  *)
- 
 +  AC_CACHE_CHECK("for PVM architecture",ac_cv_PVM_arch,
 +  [
-+  ac_cv_PVM_arch=`./pvm3/lib/pvmgetarch`
++  ac_cv_PVM_arch=`${LOCALBASE}/pvm3/lib/pvmgetarch`
 +  ])
 +  if test "$ac_cv_PVM_arch" = UNKNOWN; then
 +    AC_MSG_WARN("PVM unable to find architecture: I will not use PVM")
 +  else
 +    AC_DEFINE(WITH_PVM)
 +    PVMARCH="$ac_cv_PVM_arch"
-+    PVMGLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libgpvm3.a"
-+    PVMLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libpvm3.a"
++    PVMGLIB="\$(LOCALBASE)/pvm3/lib/$ac_cv_PVM_arch/libgpvm3.a"
++    PVMLIB="\$(LOCALBASE)/pvm3/lib/$ac_cv_PVM_arch/libpvm3.a"
 +    PVMSCIDIR=pvm
 +    PVMSCILIB=libs/pvm.a
-+    PVMTARGET=scilex-lib
++    PVMTARGET=pvm-no-build
 +  fi
-+  ;;
-+
-+esac
- fi
  
+ fi
diff --git a/math/scilab/patches/patch-au b/math/scilab/patches/patch-au
index a496017893c..4f8c7cc9981 100644
--- a/math/scilab/patches/patch-au
+++ b/math/scilab/patches/patch-au
@@ -1,7 +1,7 @@
-$NetBSD: patch-au,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $
+$NetBSD: patch-au,v 1.4 1999/11/23 16:12:40 dmcmahill Exp $
 
---- configure.orig	Thu Sep 17 09:06:23 1998
-+++ configure	Mon Oct  4 21:53:01 1999
+--- ./configure.orig	Thu Sep 17 09:06:23 1998
++++ ./configure	Mon Nov 22 19:55:23 1999
 @@ -44,5 +44,5 @@
  
  # Guess values for system-dependent variables and create Makefiles.
@@ -655,7 +655,7 @@ $NetBSD: patch-au,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $
 +       { echo "configure: error: Unable to configure: Fortran compiler f2c-f77 not found" 1>&2; exit 1; }
 +     fi
 +   else         
-+     for ac_prog in f77 f2c-f77
++     for ac_prog in "${FC}" f77 f2c-f77
 +do
 +# Extract the first word of "$ac_prog", so it can be a program name with args.
 +set dummy $ac_prog; ac_word=$2
@@ -695,7 +695,7 @@ $NetBSD: patch-au,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $
 +     fi
 +   fi
 + 
-+   FC=$F77
++   FC="$F77"
 +   FC_OPTIONS='-O2'
 +   FC_LDFLAGS="-Wl,-R${X11BASE}/lib"
 +   FC_PICFLAGS='-fPIC'
@@ -1457,40 +1457,20 @@ $NetBSD: patch-au,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $
 +if { (eval echo configure:4009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -3738,30 +4050,52 @@
+@@ -3738,29 +4050,29 @@
  if test "$with_pvm" != no; then
  
 -echo $ac_n "checking "for PVM architecture"""... $ac_c" 1>&6
 -echo "configure:3742: checking "for PVM architecture"" >&5
-+case "$host" in
-+  *-*-netbsd*)
-+  ## with NetBSD, use the version of pvm3 which is part of the package collection
 +  echo $ac_n "checking "for PVM architecture"""... $ac_c" 1>&6
-+echo "configure:4057: checking "for PVM architecture"" >&5
-+  echo "$ac_t"""NETBSD"" 1>&6
-+  cat >> confdefs.h <<\EOF
-+#define WITH_PVM 1
-+EOF
-+
-+  PVMARCH=NETBSD
-+  PVMLIB=${LOCALBASE}/lib/libpvm3.a
-+  PVMGLIB=${LOCALBASE}/lib/libgpvm3.a
-+  PVMSCIDIR=pvm
-+  PVMSCILIB=libs/pvm.a
-+  PVMTARGET=pvm-no-build
-+  ;;
-+
-+  *)
-+
-+  echo $ac_n "checking "for PVM architecture"""... $ac_c" 1>&6
-+echo "configure:4074: checking "for PVM architecture"" >&5
++echo "configure:4054: checking "for PVM architecture"" >&5
  if eval "test \"`echo '$''{'ac_cv_PVM_arch'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
 -ac_cv_PVM_arch=`./pvm3/lib/pvmgetarch`
 -
-+  ac_cv_PVM_arch=`./pvm3/lib/pvmgetarch`
++  ac_cv_PVM_arch=`${LOCALBASE}/pvm3/lib/pvmgetarch`
 +  
  fi
  
@@ -1514,109 +1494,106 @@ $NetBSD: patch-au,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $
 -  PVMTARGET=scilex-lib
 -fi
 +    PVMARCH="$ac_cv_PVM_arch"
-+    PVMGLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libgpvm3.a"
-+    PVMLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libpvm3.a"
++    PVMGLIB="\$(LOCALBASE)/pvm3/lib/$ac_cv_PVM_arch/libgpvm3.a"
++    PVMLIB="\$(LOCALBASE)/pvm3/lib/$ac_cv_PVM_arch/libpvm3.a"
 +    PVMSCIDIR=pvm
 +    PVMSCILIB=libs/pvm.a
-+    PVMTARGET=scilex-lib
++    PVMTARGET=pvm-no-build
 +  fi
-+  ;;
  
-+esac
  fi
- 
-@@ -3822,5 +4156,5 @@
+@@ -3822,5 +4134,5 @@
  
  echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
 -echo "configure:3825: checking for main in -ldl" >&5
-+echo "configure:4159: checking for main in -ldl" >&5
++echo "configure:4137: checking for main in -ldl" >&5
  ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -3830,5 +4164,5 @@
+@@ -3830,5 +4142,5 @@
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 3833 "configure"
-+#line 4167 "configure"
++#line 4145 "configure"
  #include "confdefs.h"
  
-@@ -3837,5 +4171,5 @@
+@@ -3837,5 +4149,5 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:3840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -3878,5 +4212,5 @@
+@@ -3878,5 +4190,5 @@
  echo $ac_n "  Testing version (need $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later)... " $ac_c
  cat > conftest.$ac_ext <<EOF
 -#line 3881 "configure"
-+#line 4215 "configure"
++#line 4193 "configure"
  #include "confdefs.h"
  
-@@ -3963,5 +4297,5 @@
+@@ -3963,5 +4275,5 @@
  echo $ac_n "  ""$ac_c"
  echo $ac_n "checking for Tcl_DoOneEvent in -lm""... $ac_c" 1>&6
 -echo "configure:3966: checking for Tcl_DoOneEvent in -lm" >&5
-+echo "configure:4300: checking for Tcl_DoOneEvent in -lm" >&5
++echo "configure:4278: checking for Tcl_DoOneEvent in -lm" >&5
  ac_lib_var=`echo m'_'Tcl_DoOneEvent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -3971,5 +4305,5 @@
+@@ -3971,5 +4283,5 @@
  LIBS="-lm $m $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 3974 "configure"
-+#line 4308 "configure"
++#line 4286 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -3982,5 +4316,5 @@
+@@ -3982,5 +4294,5 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:3985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -4045,5 +4379,5 @@
+@@ -4045,5 +4357,5 @@
  echo $ac_n "  Testing version (need $CHK_TK_MAJOR.$CHK_TK_MINOR or later)... " $ac_c
  cat > conftest.$ac_ext <<EOF
 -#line 4048 "configure"
-+#line 4382 "configure"
++#line 4360 "configure"
  #include "confdefs.h"
  
-@@ -4126,5 +4460,5 @@
+@@ -4126,5 +4438,5 @@
  echo $ac_n "  ""$ac_c"
  echo $ac_n "checking for Tk_BindEvent in -lm""... $ac_c" 1>&6
 -echo "configure:4129: checking for Tk_BindEvent in -lm" >&5
-+echo "configure:4463: checking for Tk_BindEvent in -lm" >&5
++echo "configure:4441: checking for Tk_BindEvent in -lm" >&5
  ac_lib_var=`echo m'_'Tk_BindEvent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -4134,5 +4468,5 @@
+@@ -4134,5 +4446,5 @@
  LIBS="-lm $m -lX11 $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 4137 "configure"
-+#line 4471 "configure"
++#line 4449 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4145,5 +4479,5 @@
+@@ -4145,5 +4457,5 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:4148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -4286,5 +4620,5 @@
+@@ -4286,5 +4598,5 @@
  # and sets the high bit in the cache file unless we assign to the vars.
  (set) 2>&1 |
 -  case `(ac_space=' '; set) 2>&1` in
 +  case `(ac_space=' '; set | grep ac_space) 2>&1` in
    *ac_space=\ *)
      # `set' does not quote correctly, so add quotes (double-quote substitution
-@@ -4353,5 +4687,5 @@
+@@ -4353,5 +4665,5 @@
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
 -    echo "$CONFIG_STATUS generated by autoconf version 2.12"
 +    echo "$CONFIG_STATUS generated by autoconf version 2.13"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
-@@ -4372,7 +4706,9 @@
+@@ -4372,7 +4684,9 @@
  $ac_vpsub
  $extrasub
 +s%@SHELL@%$SHELL%g
diff --git a/math/scilab/patches/patch-bv b/math/scilab/patches/patch-bv
new file mode 100644
index 00000000000..0a8cbc6532c
--- /dev/null
+++ b/math/scilab/patches/patch-bv
@@ -0,0 +1,11 @@
+$NetBSD: patch-bv,v 1.3 1999/11/23 16:12:40 dmcmahill Exp $
+
+--- ./routines/pvm/Makefile.orig	Mon May 18 03:29:00 1998
++++ ./routines/pvm/Makefile	Mon Nov 22 21:41:31 1999
+@@ -11,5 +11,5 @@
+ include ../../Makefile.incl
+ 
+-CFLAGS = $(CC_OPTIONS) 
++CFLAGS = $(CC_OPTIONS)  -I${LOCALBASE}/pvm3/include
+ 
+ include ../Make.lib
diff --git a/math/scilab/patches/patch-bw b/math/scilab/patches/patch-bw
new file mode 100644
index 00000000000..390c8d35781
--- /dev/null
+++ b/math/scilab/patches/patch-bw
@@ -0,0 +1,11 @@
+$NetBSD: patch-bw,v 1.3 1999/11/23 16:12:40 dmcmahill Exp $
+
+--- ./routines/pvm/pvm_grp.c.orig	Thu Apr 23 10:54:47 1998
++++ ./routines/pvm/pvm_grp.c	Mon Nov 22 21:40:11 1999
+@@ -14,5 +14,5 @@
+ #include <stdio.h>
+ #include <string.h>
+-#include "../../pvm3/include/pvm3.h"
++#include "pvm3.h"
+ #include "../machine.h"
+ 
diff --git a/math/scilab/patches/patch-bx b/math/scilab/patches/patch-bx
new file mode 100644
index 00000000000..8813d305e6b
--- /dev/null
+++ b/math/scilab/patches/patch-bx
@@ -0,0 +1,11 @@
+$NetBSD: patch-bx,v 1.3 1999/11/23 16:12:40 dmcmahill Exp $
+
+--- ./routines/pvm/pvm_info.c.orig	Thu Apr 23 10:56:21 1998
++++ ./routines/pvm/pvm_info.c	Mon Nov 22 21:40:22 1999
+@@ -16,5 +16,5 @@
+ #include <stdlib.h>
+ #include <string.h>
+-#include "../../pvm3/include/pvm3.h"
++#include "pvm3.h"
+ #include "../machine.h"
+ 
diff --git a/math/scilab/patches/patch-by b/math/scilab/patches/patch-by
new file mode 100644
index 00000000000..09956210fff
--- /dev/null
+++ b/math/scilab/patches/patch-by
@@ -0,0 +1,11 @@
+$NetBSD: patch-by,v 1.3 1999/11/23 16:12:40 dmcmahill Exp $
+
+--- ./routines/pvm/pvm_proc_ctrl.c.orig	Mon Jun 22 03:20:48 1998
++++ ./routines/pvm/pvm_proc_ctrl.c	Mon Nov 22 21:40:32 1999
+@@ -65,5 +65,5 @@
+ #include <stdlib.h>
+ #include <string.h>
+-#include "../../pvm3/include/pvm3.h"
++#include "pvm3.h"
+ #include "../machine.h"
+ #ifndef WIN32 
diff --git a/math/scilab/patches/patch-bz b/math/scilab/patches/patch-bz
new file mode 100644
index 00000000000..6ad953b1b94
--- /dev/null
+++ b/math/scilab/patches/patch-bz
@@ -0,0 +1,11 @@
+$NetBSD: patch-bz,v 1.3 1999/11/23 16:12:40 dmcmahill Exp $
+
+--- ./routines/pvm/pvm_recv.c.orig	Thu Apr 23 11:00:24 1998
++++ ./routines/pvm/pvm_recv.c	Mon Nov 22 21:40:38 1999
+@@ -15,5 +15,5 @@
+ #include <stdlib.h>
+ #include <string.h>
+-#include "../../pvm3/include/pvm3.h"
++#include "pvm3.h"
+ #include "../machine.h"
+ #include "../stack-c.h"
diff --git a/math/scilab/patches/patch-ca b/math/scilab/patches/patch-ca
new file mode 100644
index 00000000000..55633095aba
--- /dev/null
+++ b/math/scilab/patches/patch-ca
@@ -0,0 +1,11 @@
+$NetBSD: patch-ca,v 1.3 1999/11/23 16:12:40 dmcmahill Exp $
+
+--- ./routines/pvm/pvm_send.c.orig	Tue May 26 03:41:52 1998
++++ ./routines/pvm/pvm_send.c	Mon Nov 22 21:40:45 1999
+@@ -18,5 +18,5 @@
+ #include <stdlib.h>
+ #include <string.h>
+-#include "../../pvm3/include/pvm3.h"
++#include "pvm3.h"
+ #include "../machine.h"
+ #include "../stack-c.h"