sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-24 23:16:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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

PR:		34276
Submitted by:	maintainer
Obtained from:	NetBSD
This commit is contained in:
Patrick Li 2002-01-30 05:59:03 +00:00
parent 570f423501
commit 0018a485aa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=54013
16 changed files with 184 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
math/scilab/Makefile
View file

@ -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

20
math/scilab/files/patch-ab
View file

@ -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

11
math/scilab/files/patch-al Normal file
View file

@ -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`

5
math/scilab/files/patch-am Normal file
View file

@ -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

21
math/scilab/files/patch-an Normal file
View file

@ -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)

11
math/scilab/files/patch-ao Normal file
View file

@ -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)

40
math/scilab/files/patch-ap Normal file
View file

@ -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

9
math/scilab/files/patch-aq Normal file
View file

@ -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

9
math/scilab/files/patch-ar Normal file
View file

@ -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

10
math/scilab/files/patch-as Normal file
View file

@ -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

10
math/scilab/files/patch-at Normal file
View file

@ -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

10
math/scilab/files/patch-au Normal file
View file

@ -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

10
math/scilab/files/patch-av Normal file
View file

@ -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

10
math/scilab/files/patch-aw Normal file
View file

@ -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

10
math/scilab/files/patch-ax Normal file
View file

@ -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

6
math/scilab/pkg-plist
View file

@ -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