- fix a bug in the ascii() function noticed on sparc. Patch from

  Serge Steer on comp.soft-sys.scilab

- minor man page fixes

- make the 'whatis' files used for the online help be lined up in columns
  which significantly enhances readability

- minor fixes to the Makefile fragment for building scilab shared objects.

bump rev to scilab-2.6nb2

14 files changed, 241 insertions, 8 deletions

diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index c027a1d2d03..76d4cab5eb4 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2001/11/29 01:12:41 hubertf Exp $
+# $NetBSD: Makefile,v 1.29 2001/12/22 00:03:25 dmcmahill Exp $
 #
 
 DISTNAME=	${SCIBASE}.src
 PKGNAME=	${SCIBASE}
-PKGREVISION=	1
+PKGREVISION=	2
 SCIBASE=	scilab-2.6
 WRKSRC=		${WRKDIR}/${DISTNAME:.src=}
 CATEGORIES=	math
@@ -45,11 +45,20 @@ post-extract:
 	${RM} -f ${WRKSRC}/examples/callsci/callsciC/config/config
 	${RM} -f ${WRKSRC}/examples/callsci/callsciC++/config/config
 
+# make sure that the 'whatis' files in the man directories get rebuilt
+pre-build:
+	cd ${WRKSRC}/man && ${MAKE_ENV} ${MAKE_PROGRAM} cleanall
+
+post-build:
+	cd ${WRKSRC}/man && ${MAKE_ENV} ${MAKE_PROGRAM} all
+
 # clean up any possible leftovers from 'make test' so that our PLIST
-# will still be right
+# will still be right.  Also clean up .orig files we may have 
+# created during patching so they don't corrupt our PLIST
 pre-install:
 	cd ${WRKSRC}/tests && ${MAKE_PROGRAM} distclean
 	cd ${WRKSRC}/examples && ${MAKE_PROGRAM} distclean
+	find ${WRKSRC}/ -name \*.orig -print -exec rm {} \;
 
 post-install:
 	${LN} -sf ${X11PREFIX}/bin/xless ${PREFIX}/${SCIBASE}/bin/xless
diff --git a/math/scilab/PLIST b/math/scilab/PLIST
index 91df1a9678c..639274c6252 100644
--- a/math/scilab/PLIST
+++ b/math/scilab/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/28 16:52:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/12/22 00:03:25 dmcmahill Exp $
 bin/BEpsf
 bin/Blatdoc
 bin/Blatdocs
@@ -89,7 +89,6 @@ ${SCIBASE}/config/Makefile.ultrix
 ${SCIBASE}/config/Makefile.ultrix.in
 ${SCIBASE}/config/Makeso.incl
 ${SCIBASE}/config/Makeso.incl.in
-${SCIBASE}/config/Makeso.incl.in.orig
 ${SCIBASE}/config/README
 ${SCIBASE}/config/config.guess
 ${SCIBASE}/config/config.sub
diff --git a/math/scilab/distinfo b/math/scilab/distinfo
index 9f47eb2fae4..8b224343534 100644
--- a/math/scilab/distinfo
+++ b/math/scilab/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/11/28 04:21:46 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2001/12/22 00:03:25 dmcmahill Exp $
 
 SHA1 (scilab-2.6.src.tar.gz) = a91d9a33e849844ec8d6ce98657ded085c5928e0
 Size (scilab-2.6.src.tar.gz) = 6725259 bytes
@@ -7,5 +7,15 @@ SHA1 (patch-ab) = 8896079c2b11e41faf1760d5e88cfc2771a30120
 SHA1 (patch-ac) = f1f5f90b7f0c3ca2cf5dd0e602395a0b4c56cd1b
 SHA1 (patch-ad) = b44dc5cfc08a3c91c6230bff9cedd28d3cc62427
 SHA1 (patch-ae) = 5dc250f876b0932adbc7f2771843f71440c9038e
-SHA1 (patch-af) = 5cf0fe4d413607d6ff25aeb30f5a32a03fb9e2ed
+SHA1 (patch-af) = 5a94f300bfbaf7791cc3dc52382ee48693189647
 SHA1 (patch-ag) = ba61ea2d65f4e4dfef8e32b1383a956140f61871
+SHA1 (patch-ah) = bf21644c8cc3fa5eadca1440e47c769f1af3a8ac
+SHA1 (patch-ai) = 12bca09d2866492fb66b76fa98f339d60cd0830f
+SHA1 (patch-aj) = 3e7bdaf50537798b846ffafd9eb4025b3e8ca383
+SHA1 (patch-ak) = f77c630154ea33701bc4ade5daae30b03ae5ca73
+SHA1 (patch-al) = d4e15553a5eb9dd022db2512ca6177debe54c70c
+SHA1 (patch-am) = 295a23a71ea78e21309dfc70e65bac7fc5c341ec
+SHA1 (patch-an) = c0086cf9d5f89c952ec3d5b9ddf8b25835ec696d
+SHA1 (patch-ao) = 7ce1918c057a9f55626dcdd511c7dcbda9ff53d6
+SHA1 (patch-ap) = 50f6adb8083c317e9f61b6d85236b41dd850f696
+SHA1 (patch-aq) = 41326a5f035c827a0c9c8595e175273297dc20c8
diff --git a/math/scilab/patches/patch-af b/math/scilab/patches/patch-af
index 454493ffd7f..5822780206e 100644
--- a/math/scilab/patches/patch-af
+++ b/math/scilab/patches/patch-af
@@ -1,7 +1,8 @@
-$NetBSD: patch-af,v 1.4 2001/04/08 16:25:28 dmcmahill Exp $
+$NetBSD: patch-af,v 1.5 2001/12/22 00:03:26 dmcmahill Exp $
 
 libtool needs a tag for f77/f2c
 also be sure to link the fortran libs
+also allow FCTMEX to be empty.
 
 --- Makemex.in.orig	Tue May  9 06:46:04 2000
 +++ Makemex.in	Sun Apr  1 21:44:35 2001
@@ -21,3 +22,47 @@ also be sure to link the fortran libs
 +LINK = $(LIBTOOL) --mode=link $(QUIET)  $(CC) $(CFLAGS) $(LDFLAGS) $(FLIBS) -o $@
  
  OBJECTS = $(LIBRARY)_gateway.lo $(OTHEROBJECTS:.o=.lo)
+@@ -85,16 +86,16 @@
+ 	@echo "------------------------------------------";
+ 	@echo "To load the function(s): ";
+-	@for i in $(FCTMEX) ;\
++	@if test "X$(FCTMEX)" != "X"; then for i in $(FCTMEX) ;\
+ 	do (\
+ 	name=`dirname $$i`; \
+ 	echo "              $$name; " \
+ 	); \
+-	done
+-	@for i in $(FORTRANFCTMEX) ;\
++	done ; fi
++	@if test "X$(FORTRANFCTMEX)" != "X"; then for i in $(FORTRANFCTMEX) ;\
+ 	do (\
+ 	name=`dirname $$i`; \
+ 	echo "              $$name; " \
+ 	); \
+-	done
++	done ; fi
+ 	@echo " at Scilab prompt, enter:";
+ 	@echo "-->exec $(LIBRARY).sce";
+@@ -118,5 +119,5 @@
+ 
+ GATEWAYS:
+-	@for f in $(FCTMEX); \
++	@if test "X$(FCTMEX)" != "X"; then for f in $(FCTMEX); \
+ 	do \
+ 	obj=`basename $$f .c`; \
+@@ -124,6 +125,6 @@
+ 	make $$obj.o MEX=mex_$$mex ; \
+ 	make $$obj.lo MEX=mex_$$mex ; \
+-	done;
+-	@for f in $(FORTRANFCTMEX); \
++	done; fi
++	@if test "X$(FORTRANFCTMEX)" != "X"; then for f in $(FORTRANFCTMEX); \
+ 	do \
+ 	obj=`basename $$f .F`; \
+@@ -131,5 +132,5 @@
+ 	make $$obj.o MEX=mex$$mex ; \
+ 	make $$obj.lo MEX=mex$$mex ; \
+-	done;
++	done; fi
+ 
+ .c.o:
diff --git a/math/scilab/patches/patch-ah b/math/scilab/patches/patch-ah
new file mode 100644
index 00000000000..ef5a720a745
--- /dev/null
+++ b/math/scilab/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.5 2001/12/22 00:03:26 dmcmahill Exp $
+
+fix the ascii() function.
+patch from Serge Steer on comp.soft-sys.math.scilab
+
+--- 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/patches/patch-ai b/math/scilab/patches/patch-ai
new file mode 100644
index 00000000000..ce798e29839
--- /dev/null
+++ b/math/scilab/patches/patch-ai
@@ -0,0 +1,44 @@
+$NetBSD: patch-ai,v 1.5 2001/12/22 00:03:26 dmcmahill Exp $
+
+make the online help be easier to read by lining things up.
+
+--- 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/patches/patch-aj b/math/scilab/patches/patch-aj
new file mode 100644
index 00000000000..77110acc351
--- /dev/null
+++ b/math/scilab/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.5 2001/12/22 00:03:26 dmcmahill Exp $
+
+add missing white space (needed for man page cleanup)
+
+--- 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/patches/patch-ak b/math/scilab/patches/patch-ak
new file mode 100644
index 00000000000..c0b7a2289d7
--- /dev/null
+++ b/math/scilab/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.5 2001/12/22 00:03:26 dmcmahill Exp $
+
+add missing white space (needed for man page cleanup)
+
+--- 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/patches/patch-al b/math/scilab/patches/patch-al
new file mode 100644
index 00000000000..52452cc44ce
--- /dev/null
+++ b/math/scilab/patches/patch-al
@@ -0,0 +1,14 @@
+$NetBSD: patch-al,v 1.5 2001/12/22 00:03:26 dmcmahill Exp $
+
+remove extra newline (needed for man page cleanup)
+
+--- 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/patches/patch-am b/math/scilab/patches/patch-am
new file mode 100644
index 00000000000..baead150c38
--- /dev/null
+++ b/math/scilab/patches/patch-am
@@ -0,0 +1,14 @@
+$NetBSD: patch-am,v 1.5 2001/12/22 00:03:26 dmcmahill Exp $
+
+remove extra newline (needed for man page cleanup)
+
+--- 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/patches/patch-an b/math/scilab/patches/patch-an
new file mode 100644
index 00000000000..5208404c1f3
--- /dev/null
+++ b/math/scilab/patches/patch-an
@@ -0,0 +1,14 @@
+$NetBSD: patch-an,v 1.5 2001/12/22 00:03:27 dmcmahill Exp $
+
+remove extra newline (needed for man page cleanup)
+
+--- 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/patches/patch-ao b/math/scilab/patches/patch-ao
new file mode 100644
index 00000000000..3619cd91c92
--- /dev/null
+++ b/math/scilab/patches/patch-ao
@@ -0,0 +1,14 @@
+$NetBSD: patch-ao,v 1.6 2001/12/22 00:03:27 dmcmahill Exp $
+
+remove extra newline (needed for man page cleanup)
+
+--- 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/patches/patch-ap b/math/scilab/patches/patch-ap
new file mode 100644
index 00000000000..90e0cc2f1f5
--- /dev/null
+++ b/math/scilab/patches/patch-ap
@@ -0,0 +1,14 @@
+$NetBSD: patch-ap,v 1.4 2001/12/22 00:03:27 dmcmahill Exp $
+
+remove extra newline (needed for man page cleanup)
+
+--- 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/patches/patch-aq b/math/scilab/patches/patch-aq
new file mode 100644
index 00000000000..5647f59f5b5
--- /dev/null
+++ b/math/scilab/patches/patch-aq
@@ -0,0 +1,14 @@
+$NetBSD: patch-aq,v 1.4 2001/12/22 00:03:27 dmcmahill Exp $
+
+remove extra newline (needed for man page cleanup)
+
+--- 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