Date: Fri, 25 Jan 2002 17:44:26 +0100 (CET) From: Jean-Sebastien Roy <js@jeannot.org> To: FreeBSD-gnats-submit@freebsd.org Cc: Jean-Sebastien Roy <js@jeannot.org> Subject: ports/34276: Maintainer Update for math/scilab Message-ID: <200201251644.g0PGiQc11346@durandal.root>
next in thread | raw e-mail | index | archive | help
>Number: 34276 >Category: ports >Synopsis: Maintainer Update for math/scilab >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jan 25 13:40:00 PST 2002 >Closed-Date: >Last-Modified: >Originator: Jean-Sebastien Roy >Release: FreeBSD 4.4-STABLE i386 >Organization: - >Environment: System: FreeBSD durandal.root 4.4-STABLE FreeBSD 4.4-STABLE #5: Sun Dec 16 15:41:51 CET 2001 js@durandal:/opt/src/sys/compile/JS i386 >Description: This is an update to the math/scilab port. Changes : - 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. New files (13) : files/patch-al -> files/patch-ax NetBSD patches created by Dan McMahill with fixes from Serge Steer and Giuseppe Allodi. >How-To-Repeat: >Fix: diff -ruN scilab/Makefile scilab.new/Makefile --- scilab/Makefile Thu Nov 1 12:16:30 2001 +++ scilab.new/Makefile Fri Jan 25 17:08:14 2002 @@ -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 @@ -39,6 +40,9 @@ ${RM} ${WRKSRC}/examples/callsci/callsciFortran/config/config ${RM} ${WRKSRC}/examples/callsci/callsciC/config/config ${RM} ${WRKSRC}/examples/callsci/callsciC++/config/config + +post-patch: + @${PERL} -pi -e 's,%%PVM_ROOT%%,${PVM_ROOT},' ${WRKSRC}/scripts/scilab.g pre-install: find ${WRKSRC} -name \*.orig -delete diff -ruN scilab/files/patch-ab scilab.new/files/patch-ab --- scilab/files/patch-ab Thu Nov 1 12:16:30 2001 +++ scilab.new/files/patch-ab Fri Jan 25 16:40:34 2002 @@ -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 -ruN scilab/files/patch-al scilab.new/files/patch-al --- scilab/files/patch-al Thu Jan 1 01:00:00 1970 +++ scilab.new/files/patch-al Mon Jan 21 22:06:20 2002 @@ -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 -ruN scilab/files/patch-am scilab.new/files/patch-am --- scilab/files/patch-am Thu Jan 1 01:00:00 1970 +++ scilab.new/files/patch-am Mon Jan 21 22:23:23 2002 @@ -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 -ruN scilab/files/patch-an scilab.new/files/patch-an --- scilab/files/patch-an Thu Jan 1 01:00:00 1970 +++ scilab.new/files/patch-an Tue Jan 22 18:08:25 2002 @@ -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 -ruN scilab/files/patch-ao scilab.new/files/patch-ao --- scilab/files/patch-ao Thu Jan 1 01:00:00 1970 +++ scilab.new/files/patch-ao Tue Jan 22 18:08:06 2002 @@ -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 -ruN scilab/files/patch-ap scilab.new/files/patch-ap --- scilab/files/patch-ap Thu Jan 1 01:00:00 1970 +++ scilab.new/files/patch-ap Tue Jan 22 18:08:10 2002 @@ -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+' '; ++ end ++ whk=part(whk,1:p-1)+'</a>'+pad+part(whk,p:length(whk)) + wh(k)='<br><a href=""'+fnam+'"">'+whk+'<br>' + end diff -ruN scilab/files/patch-aq scilab.new/files/patch-aq --- scilab/files/patch-aq Thu Jan 1 01:00:00 1970 +++ scilab.new/files/patch-aq Tue Jan 22 18:07:56 2002 @@ -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 -ruN scilab/files/patch-ar scilab.new/files/patch-ar --- scilab/files/patch-ar Thu Jan 1 01:00:00 1970 +++ scilab.new/files/patch-ar Tue Jan 22 18:07:51 2002 @@ -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 -ruN scilab/files/patch-as scilab.new/files/patch-as --- scilab/files/patch-as Thu Jan 1 01:00:00 1970 +++ scilab.new/files/patch-as Tue Jan 22 18:07:34 2002 @@ -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 -ruN scilab/files/patch-at scilab.new/files/patch-at --- scilab/files/patch-at Thu Jan 1 01:00:00 1970 +++ scilab.new/files/patch-at Tue Jan 22 18:07:31 2002 @@ -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 -ruN scilab/files/patch-au scilab.new/files/patch-au --- scilab/files/patch-au Thu Jan 1 01:00:00 1970 +++ scilab.new/files/patch-au Tue Jan 22 18:07:27 2002 @@ -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 -ruN scilab/files/patch-av scilab.new/files/patch-av --- scilab/files/patch-av Thu Jan 1 01:00:00 1970 +++ scilab.new/files/patch-av Tue Jan 22 18:07:24 2002 @@ -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 -ruN scilab/files/patch-aw scilab.new/files/patch-aw --- scilab/files/patch-aw Thu Jan 1 01:00:00 1970 +++ scilab.new/files/patch-aw Tue Jan 22 18:07:21 2002 @@ -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 -ruN scilab/files/patch-ax scilab.new/files/patch-ax --- scilab/files/patch-ax Thu Jan 1 01:00:00 1970 +++ scilab.new/files/patch-ax Tue Jan 22 18:07:17 2002 @@ -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 -ruN scilab/pkg-plist scilab.new/pkg-plist --- scilab/pkg-plist Thu Nov 1 12:16:30 2001 +++ scilab.new/pkg-plist Fri Jan 25 16:41:04 2002 @@ -7127,10 +7127,6 @@ 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 @@ @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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200201251644.g0PGiQc11346>