- add patches from NetBSD (fixes for ascii(), fft() and the online help)

- Provide a working default PVM configuration.
- Remove unneeded pvm files form the install.

PR:		34276
Submitted by:	maintainer
Obtained from:	NetBSD

16 files changed, 184 insertions, 14 deletions

diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 11f45535d826..9175fdb2db6f 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scilab
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	math cad
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/
 EXTRACT_SUFX=	.src.tar.gz
@@ -40,6 +41,11 @@ post-extract:
 	${RM} ${WRKSRC}/examples/callsci/callsciC/config/config
 	${RM} ${WRKSRC}/examples/callsci/callsciC++/config/config
 
+pre-patch:
+	@${PERL} -pi -e 's|\r\n|\n|' ${WRKSRC}/macros/util/formatman.sci
+	@${PERL} -pi -e 's,%%PVM_ROOT%%,${PVM_ROOT},' \
+		${WRKSRC}/scripts/scilab.g
+
 pre-install:
 	find ${WRKSRC} -name \*.orig -delete
 
diff --git a/math/scilab/files/patch-ab b/math/scilab/files/patch-ab
index 4d02f340b747..cb016c3fe533 100644
--- a/math/scilab/files/patch-ab
+++ b/math/scilab/files/patch-ab
@@ -1,15 +1,19 @@
---- Makefile.in	Mon Apr 30 21:12:52 2001
-+++ Makefile.in	Mon Apr 30 22:19:49 2001
-@@ -115,8 +115,6 @@
- 	$(SCIBASE)/pvm3/lib/pvmd \
- 	$(SCIBASE)/pvm3/lib/pvmtmparch \
- 	$(SCIBASE)/pvm3/lib/pvmgetarch \
+--- Makefile.in.orig	Mon Mar 26 09:59:13 2001
++++ Makefile.in	Fri Jan 25 16:38:50 2002
+@@ -111,12 +111,6 @@
+ 	$(SCIBASE)/macros \
+ 	$(SCIBASE)/man \
+ 	$(SCIBASE)/maple \
+-	$(SCIBASE)/pvm3/lib/pvm \
+-	$(SCIBASE)/pvm3/lib/pvmd \
+-	$(SCIBASE)/pvm3/lib/pvmtmparch \
+-	$(SCIBASE)/pvm3/lib/pvmgetarch \
 -	$(SCIBASE)/pvm3/lib/@PVMARCH@/pvmd3 \
 -	$(SCIBASE)/pvm3/lib/@PVMARCH@/pvmgs \
  	$(SCIBASE)/routines/*.h \
  	$(SCIBASE)/routines/Make.lib \
  	$(SCIBASE)/routines/default/FCreate \
-@@ -147,7 +145,7 @@
+@@ -147,7 +141,7 @@
  	cd .. ; tar cvf $(SCIDIR)/$(SCIBASE)-bin.tar $(BINDISTFILES)
  	$(RM) .binary
  
@@ -18,7 +22,7 @@
  
  install:
  	@if test `pwd` != ${LIBPREFIX}/$(SCIBASE); then \
-@@ -159,12 +157,12 @@
+@@ -159,12 +153,12 @@
  		(cd ${LIBPREFIX}/$(SCIBASE); make); \
  		$(RM) .binary; \
  	fi
diff --git a/math/scilab/files/patch-al b/math/scilab/files/patch-al
new file mode 100644
index 000000000000..ef7ee5ae2eb1
--- /dev/null
+++ b/math/scilab/files/patch-al
@@ -0,0 +1,11 @@
+--- scripts/scilab.g.orig	Mon Mar 19 10:27:27 2001
++++ scripts/scilab.g	Mon Jan 21 21:36:25 2002
+@@ -29,7 +29,7 @@
+ export VERSION
+ 
+ if test "$PVM_ROOT" = ""; then
+-  PVM_ROOT=$SCI/pvm3
++  PVM_ROOT="%%PVM_ROOT%%"
+ fi
+ if test "$PVM_ARCH" = ""; then
+   PVM_ARCH=`$PVM_ROOT/lib/pvmgetarch`
diff --git a/math/scilab/files/patch-am b/math/scilab/files/patch-am
new file mode 100644
index 000000000000..304ef3efa7b3
--- /dev/null
+++ b/math/scilab/files/patch-am
@@ -0,0 +1,5 @@
+--- .pvmd.conf.orig	Mon Jan 21 22:21:01 2002
++++ .pvmd.conf	Mon Jan 21 22:22:11 2002
+@@ -1 +1 @@
+-* dx=$SCI/pvm3/lib/pvmd ep=$SCI/bin:$PVM_ROOT/bin/$PVM_ARCH
++* dx=$PVM_ROOT/lib/pvmd ep=$SCI/bin:$PVM_ROOT/bin/$PVM_ARCH
diff --git a/math/scilab/files/patch-an b/math/scilab/files/patch-an
new file mode 100644
index 000000000000..36dd4d607f5d
--- /dev/null
+++ b/math/scilab/files/patch-an
@@ -0,0 +1,21 @@
+--- routines/signal/sigelm.f.orig	Mon Feb  5 10:19:36 2001
++++ routines/signal/sigelm.f	Sun Jun  3 18:52:29 2001
+@@ -134,8 +134,18 @@
+  22   continue
+ c     rhs=4
+       ilinc=iadr(lstk(top))
++      if (istk(ilinc).ne.1) then  !protect the 4th arg. (GA 2001) 
++         err=4
++         call error(53)
++         return
++      endif
+       linc=sadr(ilinc+4)
+       nspn=int(stk(linc))
++      if (nspn.eq.0) then  !protect the 4th arg. (GA 2001)
++         err=4
++         call error(36)
++         return
++      endif
+       top=top-1
+       iln=iadr(lstk(top))
+       ln=sadr(iln+4)
diff --git a/math/scilab/files/patch-ao b/math/scilab/files/patch-ao
new file mode 100644
index 000000000000..786e302ec102
--- /dev/null
+++ b/math/scilab/files/patch-ao
@@ -0,0 +1,11 @@
+--- routines/interf/strelm.f.orig	Wed Feb 28 05:17:35 2001
++++ routines/interf/strelm.f	Wed Dec 12 16:17:42 2001
+@@ -1478,6 +1478,6 @@
+          lr=ilr+6
+          do 20 i=0,n-1
+-            m=int(stk(l+i))
+-            istk(lr+i)=getcode(m)
++            c=char(int(stk(l+i)))
++            istk(lr+i)=getcode(c)
+  20      continue
+          lstk(top+1)=sadr(lr+n)
diff --git a/math/scilab/files/patch-ap b/math/scilab/files/patch-ap
new file mode 100644
index 000000000000..3532b93e913e
--- /dev/null
+++ b/math/scilab/files/patch-ap
@@ -0,0 +1,40 @@
+--- macros/util/formatman.sci.orig	Fri Mar  2 03:50:36 2001
++++ macros/util/formatman.sci	Thu Dec 20 17:34:38 2001
+@@ -389,5 +389,5 @@
+   end
+ end
+-function wh=asciiwhatis(path,fnam)
++function wh_out=asciiwhatis(path,fnam)
+ txt=mgetl(path)
+ d=find(part(txt,1:8)=='.SH NAME')
+@@ -401,5 +401,17 @@
+ wh=stripblanks(wh)
+ k=find(wh=='');if k<>[] then wh(k)=[];end
+-wh=wh+'  @'+fnam
++sz=size(wh);
++for i=1:sz(1),
++// pad the output to make the descriptions all line up on the left
++ind=min(strindex(wh(i,:),' - '))-1;
++ind=ind(1);
++tmps=sprintf('%-15s%s',part(wh(i),1:ind),part(wh(i),(ind+1):length(wh(i))));
++tmps=tmps +'  @'+fnam
++if (i == 1),
++  wh_out = tmps;
++else
++  wh_out=sprintf('%s\n%s',wh_out,tmps);
++end
++end
+ 
+ function wh=texwhatis(path,fnam)
+@@ -426,5 +438,10 @@
+   p=p(1)
+ 
+-  whk=part(whk,1:p-1)+'</a>'+part(whk,p:length(whk))
++  // pad the output to make the descriptions all line up on the left
++  pad='';
++  for i=1:(15-p),
++    pad=pad+'&nbsp';
++  end
++  whk=part(whk,1:p-1)+'</a>'+pad+part(whk,p:length(whk))
+   wh(k)='<br><a href=""'+fnam+'"">'+whk+'<br>'
+ end
diff --git a/math/scilab/files/patch-aq b/math/scilab/files/patch-aq
new file mode 100644
index 000000000000..85828e0e9525
--- /dev/null
+++ b/math/scilab/files/patch-aq
@@ -0,0 +1,9 @@
+--- man/control/sysfact.man.orig	Thu Aug  9 10:03:06 2001
++++ man/control/sysfact.man	Thu Aug  9 10:05:23 2001
+@@ -2,5 +2,5 @@
+ .so ../sci.an 
+ .SH NAME
+-sysfact- system factorization
++sysfact - system factorization
+ .SH CALLING SEQUENCE
+ .nf
diff --git a/math/scilab/files/patch-ar b/math/scilab/files/patch-ar
new file mode 100644
index 000000000000..9f7acd7bf20c
--- /dev/null
+++ b/math/scilab/files/patch-ar
@@ -0,0 +1,9 @@
+--- man/nonlinear/derivative.man.orig	Thu Aug  9 09:31:56 2001
++++ man/nonlinear/derivative.man	Thu Aug  9 10:08:41 2001
+@@ -2,5 +2,5 @@
+ .so ../sci.an 
+ .SH NAME
+-derivative- approximate derivative
++derivative - approximate derivative
+ .SH CALLING SEQUENCE
+ .nf
diff --git a/math/scilab/files/patch-as b/math/scilab/files/patch-as
new file mode 100644
index 000000000000..dd56a7d98cd5
--- /dev/null
+++ b/math/scilab/files/patch-as
@@ -0,0 +1,10 @@
+--- man/pvm/pvm_barrier.man.orig	Thu Aug  9 09:31:56 2001
++++ man/pvm/pvm_barrier.man	Thu Aug  9 10:12:55 2001
+@@ -2,6 +2,5 @@
+ .so ../sci.an
+ .SH NAME
+-pvm_barrier - blocks the calling process until all processes
+-in a group have called it.
++pvm_barrier - blocks the calling process until all processes in a group have called it.
+ .SH CALLING SEQUENCE
+ .nf
diff --git a/math/scilab/files/patch-at b/math/scilab/files/patch-at
new file mode 100644
index 000000000000..008940ce2691
--- /dev/null
+++ b/math/scilab/files/patch-at
@@ -0,0 +1,10 @@
+--- man/pvm/pvm_error.man.orig	Thu Aug  9 09:31:56 2001
++++ man/pvm/pvm_error.man	Thu Aug  9 10:15:38 2001
+@@ -2,6 +2,5 @@
+ .so ../sci.an
+ .SH NAME
+-pvm_error - Prints  message  describing  an error  returned by a PVM call.
+-group.
++pvm_error - Prints  message  describing  an error  returned by a PVM call. 
+ .SH CALLING SEQUENCE
+ .nf
diff --git a/math/scilab/files/patch-au b/math/scilab/files/patch-au
new file mode 100644
index 000000000000..1d7a85a85216
--- /dev/null
+++ b/math/scilab/files/patch-au
@@ -0,0 +1,10 @@
+--- man/pvm/pvm_gettid.man.orig	Thu Aug  9 09:31:56 2001
++++ man/pvm/pvm_gettid.man	Thu Aug  9 10:16:23 2001
+@@ -2,6 +2,5 @@
+ .so ../sci.an
+ .SH NAME
+-pvm_gettid - returns the tid of the process identified by a
+-group name and instance number.
++pvm_gettid - returns the tid of the process identified by a group name and instance number.
+ .SH CALLING SEQUENCE
+ .nf
diff --git a/math/scilab/files/patch-av b/math/scilab/files/patch-av
new file mode 100644
index 000000000000..da19a28df296
--- /dev/null
+++ b/math/scilab/files/patch-av
@@ -0,0 +1,10 @@
+--- man/pvm/pvm_parent.man.orig	Thu Aug  9 09:31:56 2001
++++ man/pvm/pvm_parent.man	Thu Aug  9 10:17:22 2001
+@@ -2,6 +2,5 @@
+ .so ../sci.an
+ .SH NAME
+-pvm_parent - returns the tid of the process that spawned
+-the calling process.
++pvm_parent - returns the tid of the process that spawned the calling process.
+ .SH CALLING SEQUENCE
+ .nf
diff --git a/math/scilab/files/patch-aw b/math/scilab/files/patch-aw
new file mode 100644
index 000000000000..b53613d607c7
--- /dev/null
+++ b/math/scilab/files/patch-aw
@@ -0,0 +1,10 @@
+--- man/pvm/pvm_reduce.man.orig	Thu Aug  9 09:31:56 2001
++++ man/pvm/pvm_reduce.man	Thu Aug  9 10:18:01 2001
+@@ -2,6 +2,5 @@
+ .so ../sci.an
+ .SH NAME
+-pvm_reduce - Performs a reduce operation over members of the specified
+-group.
++pvm_reduce - Performs a reduce operation over members of the specified group.
+ .SH CALLING SEQUENCE
+ .nf
diff --git a/math/scilab/files/patch-ax b/math/scilab/files/patch-ax
new file mode 100644
index 000000000000..39c33411829a
--- /dev/null
+++ b/math/scilab/files/patch-ax
@@ -0,0 +1,10 @@
+--- man/pvm/pvm_tasks.man.orig	Thu Aug  9 09:31:56 2001
++++ man/pvm/pvm_tasks.man	Thu Aug  9 10:18:46 2001
+@@ -2,6 +2,5 @@
+ .so ../sci.an
+ .SH NAME
+-pvm_tasks - returns information about the tasks running
+-on the virtual machine.
++pvm_tasks - returns information about the tasks running on the virtual machine.
+ .SH CALLING SEQUENCE
+ .nf
diff --git a/math/scilab/pkg-plist b/math/scilab/pkg-plist
index 41ae2d7f7fa7..4875f8220975 100644
--- a/math/scilab/pkg-plist
+++ b/math/scilab/pkg-plist
@@ -7127,10 +7127,6 @@ scilab-2.6/maple/maple2scilab.mpl.g
 scilab-2.6/maple/examples.tst
 scilab-2.6/maple/examples.dia.ref
 scilab-2.6/maple/maple2scilab.mpl
-scilab-2.6/pvm3/lib/pvm
-scilab-2.6/pvm3/lib/pvmd
-scilab-2.6/pvm3/lib/pvmtmparch
-scilab-2.6/pvm3/lib/pvmgetarch
 scilab-2.6/routines/callinter.h
 scilab-2.6/routines/machine-abs.h
 scilab-2.6/routines/machine.h
@@ -7449,8 +7445,6 @@ scilab-2.6/.pvmd.conf
 @dirrm scilab-2.6/routines/graphics
 @dirrm scilab-2.6/routines/default
 @dirrm scilab-2.6/routines
-@dirrm scilab-2.6/pvm3/lib
-@dirrm scilab-2.6/pvm3
 @dirrm scilab-2.6/maple
 @dirrm scilab-2.6/man/utilities
 @dirrm scilab-2.6/man/translation