Attachment #19260 for bug #34276

View | Details | Raw Unified | Return to bug 34276
Collapse All | Expand All

Lines 7-12 Link Here

(-)scilab.new/Makefile (+4 lines)
7		7
8	PORTNAME= scilab	8	PORTNAME= scilab
9	PORTVERSION= 2.6	9	PORTVERSION= 2.6
		10	PORTREVISION= 1
10	CATEGORIES= math cad	11	CATEGORIES= math cad
11	MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/	12	MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/
12	EXTRACT_SUFX= .src.tar.gz	13	EXTRACT_SUFX= .src.tar.gz
Lines 39-44 Link Here
39	${RM} ${WRKSRC}/examples/callsci/callsciFortran/config/config	40	${RM} ${WRKSRC}/examples/callsci/callsciFortran/config/config
40	${RM} ${WRKSRC}/examples/callsci/callsciC/config/config	41	${RM} ${WRKSRC}/examples/callsci/callsciC/config/config
41	${RM} ${WRKSRC}/examples/callsci/callsciC++/config/config	42	${RM} ${WRKSRC}/examples/callsci/callsciC++/config/config
		43
		44	post-patch:
		45	@${PERL} -pi -e 's,%%PVM_ROOT%%,${PVM_ROOT},' ${WRKSRC}/scripts/scilab.g
42		46
43	pre-install:	47	pre-install:
44	find ${WRKSRC} -name \*.orig -delete	48	find ${WRKSRC} -name \*.orig -delete




--- 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 +141,7 @@
 	cd .. ; tar cvf $(SCIDIR)/$(SCIBASE)-bin.tar $(BINDISTFILES)
 	$(RM) .binary
 

 
 install:
 	@if test `pwd` != ${LIBPREFIX}/$(SCIBASE); then \
@@ -159,12 +153,12 @@
 		(cd ${LIBPREFIX}/$(SCIBASE); make); \
 		$(RM) .binary; \
 	fi

Line 0 Link Here

(-)scilab.new/files/patch-al (+11 lines)
	1	--- scripts/scilab.g.orig Mon Mar 19 10:27:27 2001
	2	+++ scripts/scilab.g Mon Jan 21 21:36:25 2002
	3	@@ -29,7 +29,7 @@
	4	export VERSION
	5
	6	if test "$PVM_ROOT" = ""; then
	7	- PVM_ROOT=$SCI/pvm3
	8	+ PVM_ROOT="%%PVM_ROOT%%"
	9	fi
	10	if test "$PVM_ARCH" = ""; then
	11	PVM_ARCH=`$PVM_ROOT/lib/pvmgetarch`

Line 0 Link Here

(-)scilab.new/files/patch-am (+5 lines)
	1	--- .pvmd.conf.orig Mon Jan 21 22:21:01 2002
	2	+++ .pvmd.conf Mon Jan 21 22:22:11 2002
	3	@@ -1 +1 @@
	4	-* dx=$SCI/pvm3/lib/pvmd ep=$SCI/bin:$PVM_ROOT/bin/$PVM_ARCH
	5	+* dx=$PVM_ROOT/lib/pvmd ep=$SCI/bin:$PVM_ROOT/bin/$PVM_ARCH




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

Line 0 Link Here

(-)scilab.new/files/patch-ao (+11 lines)
	1	--- routines/interf/strelm.f.orig Wed Feb 28 05:17:35 2001
	2	+++ routines/interf/strelm.f Wed Dec 12 16:17:42 2001
	3	@@ -1478,6 +1478,6 @@
	4	lr=ilr+6
	5	do 20 i=0,n-1
	6	- m=int(stk(l+i))
	7	- istk(lr+i)=getcode(m)
	8	+ c=char(int(stk(l+i)))
	9	+ istk(lr+i)=getcode(c)
	10	20 continue
	11	lstk(top+1)=sadr(lr+n)




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

Line 0 Link Here

(-)scilab.new/files/patch-aq (+9 lines)
	1	--- man/control/sysfact.man.orig Thu Aug 9 10:03:06 2001
	2	+++ man/control/sysfact.man Thu Aug 9 10:05:23 2001
	3	@@ -2,5 +2,5 @@
	4	.so ../sci.an
	5	.SH NAME
	6	-sysfact- system factorization
	7	+sysfact - system factorization
	8	.SH CALLING SEQUENCE
	9	.nf

Line 0 Link Here

(-)scilab.new/files/patch-ar (+9 lines)
	1	--- man/nonlinear/derivative.man.orig Thu Aug 9 09:31:56 2001
	2	+++ man/nonlinear/derivative.man Thu Aug 9 10:08:41 2001
	3	@@ -2,5 +2,5 @@
	4	.so ../sci.an
	5	.SH NAME
	6	-derivative- approximate derivative
	7	+derivative - approximate derivative
	8	.SH CALLING SEQUENCE
	9	.nf

Line 0 Link Here

(-)scilab.new/files/patch-as (+10 lines)
	1	--- man/pvm/pvm_barrier.man.orig Thu Aug 9 09:31:56 2001
	2	+++ man/pvm/pvm_barrier.man Thu Aug 9 10:12:55 2001
	3	@@ -2,6 +2,5 @@
	4	.so ../sci.an
	5	.SH NAME
	6	-pvm_barrier - blocks the calling process until all processes
	7	-in a group have called it.
	8	+pvm_barrier - blocks the calling process until all processes in a group have called it.
	9	.SH CALLING SEQUENCE
	10	.nf

Line 0 Link Here

(-)scilab.new/files/patch-at (+10 lines)
	1	--- man/pvm/pvm_error.man.orig Thu Aug 9 09:31:56 2001
	2	+++ man/pvm/pvm_error.man Thu Aug 9 10:15:38 2001
	3	@@ -2,6 +2,5 @@
	4	.so ../sci.an
	5	.SH NAME
	6	-pvm_error - Prints message describing an error returned by a PVM call.
	7	-group.
	8	+pvm_error - Prints message describing an error returned by a PVM call.
	9	.SH CALLING SEQUENCE
	10	.nf

Line 0 Link Here

(-)scilab.new/files/patch-au (+10 lines)
	1	--- man/pvm/pvm_gettid.man.orig Thu Aug 9 09:31:56 2001
	2	+++ man/pvm/pvm_gettid.man Thu Aug 9 10:16:23 2001
	3	@@ -2,6 +2,5 @@
	4	.so ../sci.an
	5	.SH NAME
	6	-pvm_gettid - returns the tid of the process identified by a
	7	-group name and instance number.
	8	+pvm_gettid - returns the tid of the process identified by a group name and instance number.
	9	.SH CALLING SEQUENCE
	10	.nf

Line 0 Link Here

(-)scilab.new/files/patch-av (+10 lines)
	1	--- man/pvm/pvm_parent.man.orig Thu Aug 9 09:31:56 2001
	2	+++ man/pvm/pvm_parent.man Thu Aug 9 10:17:22 2001
	3	@@ -2,6 +2,5 @@
	4	.so ../sci.an
	5	.SH NAME
	6	-pvm_parent - returns the tid of the process that spawned
	7	-the calling process.
	8	+pvm_parent - returns the tid of the process that spawned the calling process.
	9	.SH CALLING SEQUENCE
	10	.nf

Line 0 Link Here

(-)scilab.new/files/patch-aw (+10 lines)
	1	--- man/pvm/pvm_reduce.man.orig Thu Aug 9 09:31:56 2001
	2	+++ man/pvm/pvm_reduce.man Thu Aug 9 10:18:01 2001
	3	@@ -2,6 +2,5 @@
	4	.so ../sci.an
	5	.SH NAME
	6	-pvm_reduce - Performs a reduce operation over members of the specified
	7	-group.
	8	+pvm_reduce - Performs a reduce operation over members of the specified group.
	9	.SH CALLING SEQUENCE
	10	.nf

Line 0 Link Here

(-)scilab.new/files/patch-ax (+10 lines)
	1	--- man/pvm/pvm_tasks.man.orig Thu Aug 9 09:31:56 2001
	2	+++ man/pvm/pvm_tasks.man Thu Aug 9 10:18:46 2001
	3	@@ -2,6 +2,5 @@
	4	.so ../sci.an
	5	.SH NAME
	6	-pvm_tasks - returns information about the tasks running
	7	-on the virtual machine.
	8	+pvm_tasks - returns information about the tasks running on the virtual machine.
	9	.SH CALLING SEQUENCE
	10	.nf




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

@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

Return to bug 34276

Lines 7127-7136 Link Here

(-)scilab.new/pkg-plist (-6 lines)
7127	scilab-2.6/maple/examples.tst	7127	scilab-2.6/maple/examples.tst
7128	scilab-2.6/maple/examples.dia.ref	7128	scilab-2.6/maple/examples.dia.ref
7129	scilab-2.6/maple/maple2scilab.mpl	7129	scilab-2.6/maple/maple2scilab.mpl
7130	scilab-2.6/pvm3/lib/pvm
7131	scilab-2.6/pvm3/lib/pvmd
7132	scilab-2.6/pvm3/lib/pvmtmparch
7133	scilab-2.6/pvm3/lib/pvmgetarch
7134	scilab-2.6/routines/callinter.h	7130	scilab-2.6/routines/callinter.h
7135	scilab-2.6/routines/machine-abs.h	7131	scilab-2.6/routines/machine-abs.h
7136	scilab-2.6/routines/machine.h	7132	scilab-2.6/routines/machine.h
Lines 7449-7456 Link Here
7449	@dirrm scilab-2.6/routines/graphics	7445	@dirrm scilab-2.6/routines/graphics
7450	@dirrm scilab-2.6/routines/default	7446	@dirrm scilab-2.6/routines/default
7451	@dirrm scilab-2.6/routines	7447	@dirrm scilab-2.6/routines
7452	@dirrm scilab-2.6/pvm3/lib
7453	@dirrm scilab-2.6/pvm3
7454	@dirrm scilab-2.6/maple	7448	@dirrm scilab-2.6/maple
7455	@dirrm scilab-2.6/man/utilities	7449	@dirrm scilab-2.6/man/utilities
7456	@dirrm scilab-2.6/man/translation	7450	@dirrm scilab-2.6/man/translation

Lines 1-15 Link Here

(-)scilab.new/files/patch-ab (-8 / +12 lines)
1	--- Makefile.in Mon Apr 30 21:12:52 2001	1	--- Makefile.in.orig Mon Mar 26 09:59:13 2001
2	+++ Makefile.in Mon Apr 30 22:19:49 2001	2	+++ Makefile.in Fri Jan 25 16:38:50 2002
3	@@ -115,8 +115,6 @@	3	@@ -111,12 +111,6 @@
4	$(SCIBASE)/pvm3/lib/pvmd \	4	$(SCIBASE)/macros \
5	$(SCIBASE)/pvm3/lib/pvmtmparch \	5	$(SCIBASE)/man \
6	$(SCIBASE)/pvm3/lib/pvmgetarch \	6	$(SCIBASE)/maple \
		7	- $(SCIBASE)/pvm3/lib/pvm \
		8	- $(SCIBASE)/pvm3/lib/pvmd \
		9	- $(SCIBASE)/pvm3/lib/pvmtmparch \
		10	- $(SCIBASE)/pvm3/lib/pvmgetarch \
7	- $(SCIBASE)/pvm3/lib/@PVMARCH@/pvmd3 \	11	- $(SCIBASE)/pvm3/lib/@PVMARCH@/pvmd3 \
8	- $(SCIBASE)/pvm3/lib/@PVMARCH@/pvmgs \	12	- $(SCIBASE)/pvm3/lib/@PVMARCH@/pvmgs \
9	$(SCIBASE)/routines/*.h \	13	$(SCIBASE)/routines/*.h \
10	$(SCIBASE)/routines/Make.lib \	14	$(SCIBASE)/routines/Make.lib \
11	$(SCIBASE)/routines/default/FCreate \	15	$(SCIBASE)/routines/default/FCreate \
12	@@ -147,7 +145,7 @@	16	@@ -147,7 +141,7 @@
13	cd .. ; tar cvf $(SCIDIR)/$(SCIBASE)-bin.tar $(BINDISTFILES)	17	cd .. ; tar cvf $(SCIDIR)/$(SCIBASE)-bin.tar $(BINDISTFILES)
14	$(RM) .binary	18	$(RM) .binary
15		19
Lines 18-24 Link Here
18		22
19	install:	23	install:
20	@if test `pwd` != ${LIBPREFIX}/$(SCIBASE); then \	24	@if test `pwd` != ${LIBPREFIX}/$(SCIBASE); then \
21	@@ -159,12 +157,12 @@	25	@@ -159,12 +153,12 @@
22	(cd ${LIBPREFIX}/$(SCIBASE); make); \	26	(cd ${LIBPREFIX}/$(SCIBASE); make); \
23	$(RM) .binary; \	27	$(RM) .binary; \
24	fi	28	fi

Line 0 Link Here

(-)scilab.new/files/patch-an (+21 lines)
	1	--- routines/signal/sigelm.f.orig Mon Feb 5 10:19:36 2001
	2	+++ routines/signal/sigelm.f Sun Jun 3 18:52:29 2001
	3	@@ -134,8 +134,18 @@
	4	22 continue
	5	c rhs=4
	6	ilinc=iadr(lstk(top))
	7	+ if (istk(ilinc).ne.1) then !protect the 4th arg. (GA 2001)
	8	+ err=4
	9	+ call error(53)
	10	+ return
	11	+ endif
	12	linc=sadr(ilinc+4)
	13	nspn=int(stk(linc))
	14	+ if (nspn.eq.0) then !protect the 4th arg. (GA 2001)
	15	+ err=4
	16	+ call error(36)
	17	+ return
	18	+ endif
	19	top=top-1
	20	iln=iadr(lstk(top))
	21	ln=sadr(iln+4)

Line 0 Link Here

(-)scilab.new/files/patch-ap (+40 lines)
	1	--- macros/util/formatman.sci.orig Fri Mar 2 03:50:36 2001
	2	+++ macros/util/formatman.sci Thu Dec 20 17:34:38 2001
	3	@@ -389,5 +389,5 @@
	4	end
	5	end
	6	-function wh=asciiwhatis(path,fnam)
	7	+function wh_out=asciiwhatis(path,fnam)
	8	txt=mgetl(path)
	9	d=find(part(txt,1:8)=='.SH NAME')
	10	@@ -401,5 +401,17 @@
	11	wh=stripblanks(wh)
	12	k=find(wh=='');if k<>[] then wh(k)=[];end
	13	-wh=wh+' @'+fnam
	14	+sz=size(wh);
	15	+for i=1:sz(1),
	16	+// pad the output to make the descriptions all line up on the left
	17	+ind=min(strindex(wh(i,:),' - '))-1;
	18	+ind=ind(1);
	19	+tmps=sprintf('%-15s%s',part(wh(i),1:ind),part(wh(i),(ind+1):length(wh(i))));
	20	+tmps=tmps +' @'+fnam
	21	+if (i == 1),
	22	+ wh_out = tmps;
	23	+else
	24	+ wh_out=sprintf('%s\n%s',wh_out,tmps);
	25	+end
	26	+end
	27
	28	function wh=texwhatis(path,fnam)
	29	@@ -426,5 +438,10 @@
	30	p=p(1)
	31
	32	- whk=part(whk,1:p-1)+'</a>'+part(whk,p:length(whk))
	33	+ // pad the output to make the descriptions all line up on the left
	34	+ pad='';
	35	+ for i=1:(15-p),
	36	+ pad=pad+'&nbsp';
	37	+ end
	38	+ whk=part(whk,1:p-1)+'</a>'+pad+part(whk,p:length(whk))
	39	wh(k)='<br><a href=""'+fnam+'"">'+whk+'<br>'
	40	end