Update to octave-forge-2004.09.09. The most notable change is that this

version now works with octave-current-2.1.59 which is what's currently
in pkgsrc.  Other than than, many minor bug fixes.

13 files changed, 721 insertions, 759 deletions

diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index a5e8a3b9e77..ed7a11837b6 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:12:57 tv Exp $
+# $NetBSD: Makefile,v 1.4 2004/10/30 06:56:04 dmcmahill Exp $
 #
 
-DISTNAME=	octave-forge-2004.07.07
-PKGREVISION=	1
+DISTNAME=	octave-forge-2004.09.09
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=octave/}
 
@@ -25,6 +24,8 @@ USE_GNU_TOOLS+=	make
 USE_X11=	YES
 
 ALL_TARGET=	
+TEST_DIRS=	${WRKSRC}
+TEST_TARGET=	check
 
 GCC_REQD=	3.0
 USE_LANGUAGES=	c c++ fortran
diff --git a/math/octave-forge/PLIST b/math/octave-forge/PLIST
index cd421729d81..9eb10337605 100644
--- a/math/octave-forge/PLIST
+++ b/math/octave-forge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/03 11:58:48 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/10/30 06:56:04 dmcmahill Exp $
 bin/mex
 man/man1/mex.1
 share/octave/${OCT_VERSION}/site/octave-forge-alternatives/m/graceplot/PKG_ADD
@@ -103,10 +103,6 @@ ${OCT_LOCALVEROCTFILEDIR}/octave-forge/bessel_zero_J1.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/beta_gsl.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/bfgsmin.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/bisectionstep.oct
-${OCT_LOCALVEROCTFILEDIR}/octave-forge/bitand.oct
-${OCT_LOCALVEROCTFILEDIR}/octave-forge/bitmax.oct
-${OCT_LOCALVEROCTFILEDIR}/octave-forge/bitor.oct
-${OCT_LOCALVEROCTFILEDIR}/octave-forge/bitxor.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/builtin.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/bwfill.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/bwlabel.oct
@@ -170,7 +166,7 @@ ${OCT_LOCALVEROCTFILEDIR}/octave-forge/gammainv_gsl.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/gammastar.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/gdet.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/gdiag.oct
-${OCT_LOCALVEROCTFILEDIR}/octave-forge/getfield.oct
+${OCT_LOCALVEROCTFILEDIR}/octave-forge/getfields.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/gexp.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/gf.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/gfilter.oct
@@ -182,6 +178,7 @@ ${OCT_LOCALVEROCTFILEDIR}/octave-forge/gpick.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/gprod.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/grab.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/grank.oct
+${OCT_LOCALVEROCTFILEDIR}/octave-forge/graycomatrix.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/greshape.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/gsl_sf.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/gsqrt.oct
@@ -190,6 +187,7 @@ ${OCT_LOCALVEROCTFILEDIR}/octave-forge/gsumsq.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/gtext.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/gzoom.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/hazard.oct
+${OCT_LOCALVEROCTFILEDIR}/octave-forge/houghtf.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/hyperg_0F1.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/hzeta.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/is_complex_sparse.oct
@@ -201,7 +199,6 @@ ${OCT_LOCALVEROCTFILEDIR}/octave-forge/jpgread.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/jpgwrite.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/lambert_W0.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/lambert_Wm1.oct
-${OCT_LOCALVEROCTFILEDIR}/octave-forge/lbfgsmin.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/legendre_Pl.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/legendre_Plm.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/legendre_Ql.oct
@@ -248,9 +245,8 @@ ${OCT_LOCALVEROCTFILEDIR}/octave-forge/rotate_scale.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/rsdec.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/rsenc.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/samin.oct
-${OCT_LOCALVEROCTFILEDIR}/octave-forge/setfield.oct
+${OCT_LOCALVEROCTFILEDIR}/octave-forge/setfields.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/sinc_gsl.oct
-${OCT_LOCALVEROCTFILEDIR}/octave-forge/sort.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/spabs.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/sparse.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/spfind.oct
@@ -258,7 +254,6 @@ ${OCT_LOCALVEROCTFILEDIR}/octave-forge/spimag.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/spinv.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/splu.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/spreal.oct
-${OCT_LOCALVEROCTFILEDIR}/octave-forge/struct.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/synchrotron_1.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/synchrotron_2.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/syndtable.oct
@@ -344,10 +339,6 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/comm/symerr.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/comm/vec2mat.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/comm/wgn.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/control/feedback.m
-${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/bitcmp.m
-${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/bitget.m
-${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/bitset.m
-${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/bitshift.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/blkdiag.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/char.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/complex.m
@@ -364,10 +355,12 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/ifftshift.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/interp1.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/interp2.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/interpft.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/isa.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/isequal.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/isunix.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/lookup.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/ndims.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/nthroot.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/polyarea.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/quadl.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/rat.m
@@ -390,19 +383,30 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/ident/idsim.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/ident/mktheta.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/ident/poly2th.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/MakeShears.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/applylut.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/autumn.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/bestblk.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/blkproc.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/bmpwrite.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/bone.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/brighten.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/bwborder.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/bweuler.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/bwmorph.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/bwlabel.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/bwselect.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/cmpermute.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/cmunique.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/col2im.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/colfilt.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/colorgradient.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/conndef.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/cool.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/copper.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/corr2.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/dilate.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/edge.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/erode.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/fftconv2.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/flag.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/grayslice.m
@@ -410,6 +414,7 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/histeq.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/hot.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/hsv.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/im2bw.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/im2col.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/imadjust.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/imginfo.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/imhist.m
@@ -423,19 +428,30 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/imwrite.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/isbw.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/isgray.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/isind.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/isrgb.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/jet.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/makelut.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/mat2gray.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/mean2.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/medfilt2.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/nlfilter.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/ordfilt2.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/padarray.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/pink.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/poly2mask.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/prism.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/qtdecomp.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/qtgetblk.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/qtsetblk.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/rainbow.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/rgb2gray.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/roicolor.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/spring.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/std2.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/stretchlim.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/summer.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/testimio.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/uintlut.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/white.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/winter.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/integration/Contents.m
@@ -464,6 +480,8 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/integration/quadg.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/integration/quadndg.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/integration/zero_count.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/io/append_save.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/io/csvread.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/io/csvwrite.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/io/dlmread.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/io/dlmwrite.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/io/textread.m
@@ -493,7 +511,6 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/OCTAVE_FORGE_VERSION.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/PKG_ADD
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/edit.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/grep.m
-${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/inline.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/inputname.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/inz.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/map.m
@@ -516,7 +533,7 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/ode/rk8fixed.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/adsmax.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/battery.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/bfgs.m
-${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/bfgsmin-example.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/bfgsmin_example.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/bs_gradient.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/cdiff.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/d2_min.m
@@ -529,7 +546,6 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/fminbnd.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/fmins.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/fminunc.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/fzero.m
-${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/lbfgsmin-example.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/leasqr.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/leasqrdemo.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/line_min.m
@@ -542,7 +558,7 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/nrm.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/optimset.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/poly_2_ex.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/polyconf.m
-${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/samin-example.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/samin_example.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/test_d2_min_1.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/test_d2_min_2.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/test_d2_min_3.m
@@ -634,6 +650,7 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/filtfilt.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/filtic.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/fir1.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/fir2.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/flattopwin.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/freqs.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/freqs_plot.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/gaussian.m
@@ -675,6 +692,7 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/sparse/fem_test.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/sparse/issparse.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/sparse/nonzeros.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/sparse/pcg.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/sparse/pcr.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/sparse/sp_test.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/sparse/spdiags.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/sparse/speye.m
@@ -719,12 +737,15 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/splines/ppval.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/splines/spline.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/splines/trisolve.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/splines/unmkpp.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/anderson_darling_cdf.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/anderson_darling_test.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/anovan.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/boxplot.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/ff2n.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/fullfact.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/geomean.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/harmmean.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/histfit.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/mad.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/nanmax.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/nanmean.m
@@ -733,9 +754,11 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/nanmin.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/nanstd.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/nansum.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/normplot.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/pareto.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/prctile.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/princomp.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/scatter.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/tabulate.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/trimmean.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/zscore.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/strings/base64encode.m
@@ -751,9 +774,11 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/strings/strtok.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/strings/strvcat.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/struct/fieldnames.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/struct/getfield.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/struct/getfields.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/struct/isfield.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/struct/rmfield.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/struct/setfield.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/struct/setfields.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/struct/struct.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/struct/tar.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/struct/test_struct.m
@@ -776,9 +801,11 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/testfun/fail.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/testfun/pretty
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/testfun/speed.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/testfun/test.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/time/calendar.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/time/datenum.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/time/datestr.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/time/datevec.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/time/eomday.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/time/now.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/time/weekday.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/aar.m
@@ -824,6 +851,7 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/poly2rc.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/rc2ac.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/rc2ar.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/rc2poly.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/rmle.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/sbispec.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/selmo.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/sinvest1.m
diff --git a/math/octave-forge/distinfo b/math/octave-forge/distinfo
index 33882060a0d..c7ec49952fc 100644
--- a/math/octave-forge/distinfo
+++ b/math/octave-forge/distinfo
@@ -1,13 +1,15 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/08/14 13:29:56 dmcmahill Exp $
+$NetBSD: distinfo,v 1.2 2004/10/30 06:56:04 dmcmahill Exp $
 
-SHA1 (octave-forge-2004.07.07.tar.gz) = 9dd2352d5b5d6f3b934c34db33baa488bf5eb793
-Size (octave-forge-2004.07.07.tar.gz) = 3535603 bytes
+SHA1 (octave-forge-2004.09.09.tar.gz) = 69f871efb24018bec550fc040fc2c2d56d214bb3
+Size (octave-forge-2004.09.09.tar.gz) = 3612150 bytes
 SHA1 (patch-aa) = 1723f94e7532dd8ddd691bf5a348c5447b4d312b
-SHA1 (patch-ab) = a9a5aebff50b94d7e9d7e5a63592c7cb46971210
-SHA1 (patch-ac) = 1ef1b8c6037c4931910f128781e7329eec79b548
-SHA1 (patch-ad) = 8b16fd05071710499593d83bb6a825c527940ae3
-SHA1 (patch-ae) = c337188b34ed78bd01fe8c1eee65de127e99228f
-SHA1 (patch-af) = 6d530695a953b44aca7ac2152c8105d24223de46
-SHA1 (patch-ag) = a5b82614b0433807dbb3a76bf0c9b7ff51943abf
-SHA1 (patch-ah) = 2ca9ccc5df44cee1d94baaacd512dcf387995970
-SHA1 (patch-ai) = 83f5a09a89fa3171028443e68aa0b2c21a567199
+SHA1 (patch-ab) = ef033ec4854e0bd9ff1a9b0264e0482c2bb0ed9e
+SHA1 (patch-ac) = 14c201996fc9dcbb65e213af15003dda31ac09ae
+SHA1 (patch-ad) = 1d6064dd93ce0f312ae800cc3003ff0a56cfe405
+SHA1 (patch-ae) = 6ec4152e68e668e6e9b636b267535dc69c54da36
+SHA1 (patch-af) = f3920b982014a06ecc5aac8d99e527918bf5e4c1
+SHA1 (patch-ag) = 86f1a0f10a228aa68936b36ed19f43db45e0c60c
+SHA1 (patch-ah) = fcf99bbb0866656cbdda6881bdba42cbd47993b6
+SHA1 (patch-ai) = 2ccbd22c9ffbbb21994b8afa20903b5eb1b4ffb3
+SHA1 (patch-aj) = eb13d828a9c9b727a751d3bfe53c3d8635c50195
+SHA1 (patch-ak) = 49c63b4b2a92cb971410f325a077152d7b5ebcd8
diff --git a/math/octave-forge/patches/patch-ab b/math/octave-forge/patches/patch-ab
index cc2ba382780..51492524c8c 100644
--- a/math/octave-forge/patches/patch-ab
+++ b/math/octave-forge/patches/patch-ab
@@ -1,24 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/08/14 13:29:56 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.2 2004/10/30 06:56:04 dmcmahill Exp $
 
---- main/miscellaneous/configure.add.orig	Sun Dec 14 04:00:04 2003
-+++ main/miscellaneous/configure.add
-@@ -45,14 +45,14 @@ else
- 	    AC_CHECK_HEADER(termcap.h, have_termcap=yes, have_termcap=no)
- 	;;
-     esac
--    if test $have_term = yes; then
--       MISCDEFS="$MISCDEFS -DUSE_TERM -DHAVE_TERM_H"
--       STATUS=yes
--       AC_CHECK_LIB(termcap, tgetnum, HAVE_LIB_TERMCAP=yes)
--    elif test $have_termcap = yes; then
-+    if test $have_termcap = yes; then
-        MISCDEFS="$MISCDEFS -DUSE_TERM -DHAVE_TERMCAP_H"
-        AC_CHECK_LIB(termcap, tgetnum, HAVE_LIB_TERMCAP=yes)
-        STATUS=yes 
-+    elif test $have_term = yes; then
-+       MISCDEFS="$MISCDEFS -DUSE_TERM -DHAVE_TERM_H"
-+       STATUS=yes
-+       AC_CHECK_LIB(termcap, tgetnum, HAVE_LIB_TERMCAP=yes)
-     else
-        STATUS=no
-     fi
+--- main/miscellaneous/listen.cc.orig	Tue Jul 27 20:39:43 2004
++++ main/miscellaneous/listen.cc
+@@ -33,7 +33,7 @@ static char* context = NULL;
+ 
+ static double timestamp = 0.0;
+ inline void tic(void) { timestamp = octave_time(); }
+-inline double toc(void) {return round(-1e6*(timestamp-double(octave_time())));}
++inline double toc(void) {return floor(0.5+-1e6*(timestamp-double(octave_time())));}
+ 
+ // XXX FIXME XXX --- surely this is part of the standard library?
+ void
diff --git a/math/octave-forge/patches/patch-ac b/math/octave-forge/patches/patch-ac
index 2b42a108ceb..60e400d2f10 100644
--- a/math/octave-forge/patches/patch-ac
+++ b/math/octave-forge/patches/patch-ac
@@ -1,18 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/08/14 13:29:56 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2004/10/30 06:56:04 dmcmahill Exp $
 
---- configure.base.orig	Mon Apr 12 01:47:27 2004
-+++ configure.base
-@@ -283,10 +283,10 @@ AC_PROG_INSTALL
- AC_PROG_RANLIB
+--- main/sparse/buildtests.sh.orig	Thu Sep  9 04:16:42 2004
++++ main/sparse/buildtests.sh
+@@ -453,7 +453,7 @@ EOF
+ # =======================================================
+ # sparse save and load tests
  
- dnl Use $(COPY_FLAGS) to set options for cp when installing .oct files.
--COPY_FLAGS="-fdp"
-+COPY_FLAGS="-Rfp"
- case "$canonical_host_type" in
--    powerpc-apple-darwin*)
--        COPY_FLAGS="-Rfp"
-+    *-*-linux*)
-+        COPY_FLAGS="-fdp"
-     ;;
- esac
- AC_SUBST(COPY_FLAGS)
+-function gen_save_tests {
++gen_save_tests() {
+     cat >>$TESTS <<EOF
+ %!test # save ascii
+ %! savefile= tmpnam();
diff --git a/math/octave-forge/patches/patch-ad b/math/octave-forge/patches/patch-ad
index 25e7af12d27..4aff941102a 100644
--- a/math/octave-forge/patches/patch-ad
+++ b/math/octave-forge/patches/patch-ad
@@ -1,132 +1,17 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/08/14 13:29:56 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.2 2004/10/30 06:56:04 dmcmahill Exp $
 
-get rid of bash-isms
-
---- main/sparse/buildtests.sh.orig	Wed Jul  7 15:25:45 2004
-+++ main/sparse/buildtests.sh
-@@ -89,7 +89,7 @@ EOF
- # =======================================================
- # Section separator
- 
--function gen_section {
-+gen_section() {
- cat >>$TESTS <<EOF
- 
- # ==============================================================
-@@ -104,7 +104,7 @@ EOF
- # =======================================================
- # If a sparse operation yields zeros, then those elements 
- # of the returned sparse matrix should be eaten.
--function gen_eat_zeros {
-+gen_eat_zeros() {
- cat >>$TESTS <<EOF
- %% Make sure newly introduced zeros get eaten
- %!assert(nnz(sparse([bf,bf,1]).^realmax),1);
-@@ -126,7 +126,7 @@ cat >>$TESTS <<EOF
- EOF
- }
- 
--function gen_specific {
-+gen_specific() {
- cat >>$TESTS <<EOF
- 
- %!test # segfault test from edd@debian.org
-@@ -158,7 +158,7 @@ EOF
- }
- 
- 
--function gen_specific_tests {
-+gen_specific_tests() {
-     gen_section
-     gen_specific
-     gen_section
-@@ -184,7 +184,7 @@ EOF
- # =======================================================
- # Main function definition
- 
--function gen_function {
-+gen_function() {
-     if $preset; then
- 	cat >>$TESTS <<EOF
- ##
-@@ -227,7 +227,7 @@ EOF
- # matrix ops
- 
- # test ordered comparisons: uses as,af,bx,bf
--function gen_ordering_tests {
-+gen_ordering_tests() {
-     cat >>$TESTS <<EOF
- %% real values can be ordered (uses as,af)
- %!assert(as<=bx,af<=bf)
-@@ -243,7 +243,7 @@ EOF
- }
- 
- # test element-wise binary operations: uses as,af,bx,bf
--function gen_elementop_tests {
-+gen_elementop_tests() {
-     cat >>$TESTS <<EOF
- %% Elementwise binary tests (uses as,af,bx,bf)
- %!assert(as==bx,af==bf)
-@@ -268,7 +268,7 @@ EOF
- }
- 
- # test matrix-matrix operations: uses as,af,bx,bf
--function gen_matrixop_tests {
-+gen_matrixop_tests() {
-     cat >>$TESTS <<EOF
- %% Matrix-matrix operators (uses af,as,bx,bf)
- %!assert(as*bx',af*bf')
-@@ -280,7 +280,7 @@ EOF
- }
- 
- # test matrix operations: uses as,af
--function gen_unaryop_tests {
-+gen_unaryop_tests() {
-     cat >>$TESTS <<EOF
- %% Unary matrix tests (uses af,as)
- %!assert(is_sparse(as),1)
-@@ -343,7 +343,7 @@ EOF
- }
- 
- # operations which require square matrices.
--function gen_square_tests {
-+gen_square_tests() {
-     cat >>$TESTS <<EOF
- %!test ;# permuted LU
- %! [L,U] = splu(bx);
-@@ -369,7 +369,7 @@ EOF
- }
- 
- # test scalar operations: uses af and real scalar bf; modifies as,bx
--function gen_scalar_tests {
-+gen_scalar_tests() {
-     echo '%!test as=sparse(af);' >> $TESTS
-     echo '%!test bx=bf;' >> $TESTS
-     gen_elementop_tests
-@@ -378,7 +378,7 @@ function gen_scalar_tests {
- }
- 
- # test matrix operations: uses af and bf; modifies as,bx
--function gen_rectangular_tests {
-+gen_rectangular_tests() {
-     echo '%!test as=sparse(af);' >> $TESTS
-     echo '%!test bx=bf;' >>$TESTS
-     gen_unaryop_tests
-@@ -393,7 +393,7 @@ function gen_rectangular_tests {
- # =======================================================
- # sparse assembly tests
+--- main/sparse/Makefile.orig	Tue Jul 27 20:56:44 2004
++++ main/sparse/Makefile
+@@ -133,10 +133,10 @@ S_DOUBLE= $(DLUSRC) $(ALLAUX) $(DZLAUX) 
+ all: $(NAME).oct $(OBJLINKS) sptest.m 
  
--function gen_assembly_tests {
-+gen_assembly_tests() {
- echo >>$TESTS <<EOF
- %%Assembly tests
- %!test
-@@ -422,7 +422,7 @@ EOF
- # =======================================================
- # sparse selection tests
+ sptest.m: buildtests.sh
+-	bash buildtests.sh preset
++	${SHELL} buildtests.sh preset
  
--function gen_select_tests {
-+gen_select_tests() {
-     cat >>$TESTS <<EOF
- %!test as=sparse(af);
+ sprandomtest.m: buildtests.sh
+-	bash buildtests.sh random
++	${SHELL} buildtests.sh random
  
+ $(S_DOUBLE):%.o:%.c
+ 	$(CC) $(CFLAGS) $(CPICFLAG) $(S_INC) $(SUPERLU_DEFS) -c $< -o $@
diff --git a/math/octave-forge/patches/patch-ae b/math/octave-forge/patches/patch-ae
index 98d669fa4ed..fcbe764fdc9 100644
--- a/math/octave-forge/patches/patch-ae
+++ b/math/octave-forge/patches/patch-ae
@@ -1,13 +1,59 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/08/14 13:29:56 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.2 2004/10/30 06:56:04 dmcmahill Exp $
 
---- extra/mex/Makefile.orig	Fri Feb  6 17:05:11 2004
-+++ extra/mex/Makefile
-@@ -58,7 +58,7 @@ endif
- 	@if test -d $(bindir) ; then \
- 	  echo installing mex/mex in $(bindir) ; \
- 	  $(RM) $(bindir)/mex ; \
--	  $(INSTALL_PROGRAM) mex $(bindir)/mex ; \
-+	  $(INSTALL_SCRIPT) mex $(bindir)/mex ; \
- 	fi
- 
- clean: ; $(RM) mex mex_* $(MEXLIB) *.o *.oct core octave-core *~
+--- extra/mex/mex.in.orig	Thu Sep  9 11:48:44 2004
++++ extra/mex/mex.in
+@@ -34,6 +34,7 @@ else
+ fi
+ 
+ # default the name of the octave function from the first filename
++dir=`dirname $first`
+ first=`basename $first`
+ #echo "first= $first"
+ ext=`echo $first | sed 's;.*\.;.;g'`
+@@ -52,6 +53,16 @@ case "$ext" in
+   ;;
+ esac
+ 
++# search for a .m file which will be used for the help string
++# in the mex function.
++if test -f $dir/$name.m ; then
++	mfile=$dir/$name.m
++elif test -f ./$name.m ; then
++	mfile=./$name.m
++else
++	mfile=""
++fi
++
+ cat <<EOF > mex_$name.cc
+ #include <octave/oct.h>
+ 
+@@ -63,10 +74,28 @@ extern "C" {
+   const char *mexFunctionName = "$name";
+ } ;
+ 
+-DEFUN_DLD($name, args, nargout, "\
++DEFUN_DLD($name, args, nargout,
++EOF
++
++if test "X$mfile" = "X" ; then
++	cat <<EOF >> mex_$name.cc
++"\
+ $name not directly documented. Try the following:\n\
+    type(file_in_loadpath('$name.m'))\n\
+ ")
++EOF
++else
++	@_AWK_@ 'BEGIN{print "\"\\"} 
++		/^[ \t]*$/ {exit} 
++		{gsub(/^%/,""); 
++		gsub(/\\/,"\\\\"); 
++		gsub(/"/,"\\\""); 
++		print $0 "\\n\\"} 
++		END{print "\")"}' \
++		$mfile >> mex_$name.cc
++fi
++
++cat <<EOF >> mex_$name.cc
+ {
+   octave_value_list $invoke(const octave_value_list &, const int);
+   return $invoke(args, nargout);
diff --git a/math/octave-forge/patches/patch-af b/math/octave-forge/patches/patch-af
index 0023634aeea..1adf18adbbc 100644
--- a/math/octave-forge/patches/patch-af
+++ b/math/octave-forge/patches/patch-af
@@ -1,12 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/08/14 13:29:56 dmcmahill Exp $
+$NetBSD: patch-af,v 1.2 2004/10/30 06:56:04 dmcmahill Exp $
 
---- Makeconf.base.orig	Mon Apr 26 04:22:51 2004
-+++ Makeconf.base
-@@ -19,6 +19,7 @@ infodir = @infodir@
- includedir = @includedir@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALLOCT=octinst.sh
- 
+--- /dev/null	Mon Oct 18 16:08:42 2004
++++ extra/mex/configure.add	Mon Oct 18 16:26:09 2004
+@@ -0,0 +1,3 @@
++
++AC_PROG_AWK
++
diff --git a/math/octave-forge/patches/patch-ag b/math/octave-forge/patches/patch-ag
index 038471d9718..556f774ed83 100644
--- a/math/octave-forge/patches/patch-ag
+++ b/math/octave-forge/patches/patch-ag
@@ -1,12 +1,515 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/08/14 13:29:56 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.2 2004/10/30 06:56:04 dmcmahill Exp $
 
---- Makeconf.in.orig	Wed Jul  7 17:52:53 2004
-+++ Makeconf.in
-@@ -19,6 +19,7 @@ infodir = @infodir@
- includedir = @includedir@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALLOCT=octinst.sh
+--- configure.orig	Thu Sep  9 16:04:09 2004
++++ configure
+@@ -309,7 +309,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
  
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION TOPDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MKOCTFILE ver subver mpath opath xpath altpath altmpath altopath CPICFLAG F77 FFLAGS FPICFLAG CXX CXXFLAGS CXXPICFLAG OCTAVE OCTAVE_VERSION canonical_host_type SHLEXT LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB COPY_FLAGS STRIP DEFHAVE_X X_LIBS X_CFLAGS CPP X_PRE_LIBS X_EXTRA_LIBS HAVE_DO_FORTRAN_INDEXING HAVE_PROPAGATE_EMPTY_MATRICES HAVE_OK_TO_LOSE_IMAGINARY_PART HAVE_ND_ARRAYS TYPEID_HAS_CLASS CLASS_HAS_LOAD_SAVE HAVE_OCTAVE_MAP_INDEX HAVE_OCTAVE_CONCAT HAVE_SWAP_BYTES MAKEINFO TEXI2DVI TEXI2HTML DVIPDF DVIPS MKDOC MKTEXI HAVE_IEEE754_COMPLIANCE OCTAVE_FORGE_RELEASE EGREP DEFHAVE_LINUX_SOUNDCARD HAVE_RESIZE_AND_FILL HAVE_6ARG_MX_ND_RED OCTAVEFIXEDVERSION have_qhull need_qhull_version DEFHAVE_LIBGSL DEFHAVE_JPEG DEFHAVE_PNG MISCDEFS HAVE_LIB_TERMCAP HAVE_BUILTIN_STRUCT have_ginac DEFHAVE_GINAC LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION TOPDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MKOCTFILE ver subver mpath opath xpath altpath altmpath altopath CPICFLAG F77 FFLAGS FPICFLAG CXX CXXFLAGS CXXPICFLAG OCTAVE OCTAVE_VERSION canonical_host_type SHLEXT LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB COPY_FLAGS STRIP DEFHAVE_X X_LIBS X_CFLAGS CPP X_PRE_LIBS X_EXTRA_LIBS HAVE_DO_FORTRAN_INDEXING HAVE_PROPAGATE_EMPTY_MATRICES HAVE_OK_TO_LOSE_IMAGINARY_PART HAVE_ND_ARRAYS TYPEID_HAS_CLASS CLASS_HAS_LOAD_SAVE HAVE_OCTAVE_MAP_INDEX HAVE_OCTAVE_CONCAT HAVE_SWAP_BYTES MAKEINFO TEXI2DVI TEXI2HTML DVIPDF DVIPS MKDOC MKTEXI HAVE_IEEE754_COMPLIANCE OCTAVE_FORGE_RELEASE AWK EGREP DEFHAVE_LINUX_SOUNDCARD HAVE_RESIZE_AND_FILL HAVE_6ARG_MX_ND_RED OCTAVEFIXEDVERSION have_qhull need_qhull_version DEFHAVE_LIBGSL DEFHAVE_JPEG DEFHAVE_PNG MISCDEFS HAVE_LIB_TERMCAP HAVE_BUILTIN_STRUCT have_ginac DEFHAVE_GINAC LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -954,7 +954,7 @@ esac
+     else
+       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+     fi
+-    cd "$ac_popdir"
++    cd $ac_popdir
+   done
+ fi
+ 
+@@ -1885,7 +1885,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -1943,7 +1944,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2059,7 +2061,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2113,7 +2116,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2158,7 +2162,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2202,7 +2207,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3077,12 +3083,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-
+-if test "x$ac_path_x_has_been_run" != xyes; then
+-  echo "$as_me:$LINENO: checking for X" >&5
++echo "$as_me:$LINENO: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+-ac_path_x_has_been_run=yes
+ 
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -3175,7 +3178,7 @@ ac_x_header_dirs='
+ /usr/openwin/share/include'
+ 
+ if test "$ac_x_includes" = no; then
+-  # Guess where to find include files, by looking for a specified header file.
++  # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3249,7 +3252,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3309,15 +3313,10 @@ else
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  # It might be that x_includes is empty (headers are found in the
+-  # standard search path. Then output the corresponding message
+-  ac_out_x_includes=$x_includes
+-  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
+-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
+-echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
++  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
++echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+-fi
+ if test "$no_x" = yes; then
+   # Not all programs may use this symbol, but it does not hurt to define it.
+ 
+@@ -3365,7 +3364,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3416,7 +3416,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3492,7 +3493,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3547,7 +3549,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3615,7 +3618,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3723,7 +3727,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3787,7 +3792,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3855,7 +3861,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3959,7 +3966,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4023,7 +4031,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4120,7 +4129,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4184,7 +4194,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4281,7 +4292,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4345,7 +4357,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4424,7 +4437,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4996,6 +5010,48 @@ OCTAVE_FORGE_RELEASE=`date +%Y.%m.%d`
+ 
+ CONFIGURE_OUTPUTS="$CONFIGURE_OUTPUTS admin/RPM/octave-forge.spec"
+ 
++for ac_prog in gawk mawk nawk awk
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_AWK+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AWK"; then
++  ac_cv_prog_AWK="$AWK" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_AWK="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++  echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$AWK" && break
++done
++
++
++
+ if test -e main/audio/NOINSTALL ; then
+ 
+ 		STATUS=noinstall
+@@ -5054,7 +5110,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5224,7 +5281,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5287,7 +5345,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5537,7 +5596,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5689,7 +5749,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5818,7 +5879,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5902,7 +5964,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6054,7 +6117,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6130,7 +6194,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6282,7 +6347,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6371,7 +6437,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6459,7 +6526,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6602,7 +6670,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6757,7 +6826,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6828,7 +6898,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7582,6 +7653,7 @@ s,@MKDOC@,$MKDOC,;t t
+ s,@MKTEXI@,$MKTEXI,;t t
+ s,@HAVE_IEEE754_COMPLIANCE@,$HAVE_IEEE754_COMPLIANCE,;t t
+ s,@OCTAVE_FORGE_RELEASE@,$OCTAVE_FORGE_RELEASE,;t t
++s,@AWK@,$AWK,;t t
+ s,@EGREP@,$EGREP,;t t
+ s,@DEFHAVE_LINUX_SOUNDCARD@,$DEFHAVE_LINUX_SOUNDCARD,;t t
+ s,@HAVE_RESIZE_AND_FILL@,$HAVE_RESIZE_AND_FILL,;t t
+@@ -7765,6 +7837,11 @@ esac
+   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+   esac
+ 
++  if test x"$ac_file" != x-; then
++    { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++    rm -f "$ac_file"
++  fi
+   # Let's still pretend it is `configure' which instantiates (i.e., don't
+   # use $as_me), people would be surprised to read:
+   #    /* config.h.  Generated by config.status.  */
+@@ -7803,12 +7880,6 @@ echo "$as_me: error: cannot find input f
+ 	 fi;;
+       esac
+     done` || { (exit 1); exit 1; }
+-
+-  if test x"$ac_file" != x-; then
+-    { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-    rm -f "$ac_file"
+-  fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+   sed "$ac_vpsub
diff --git a/math/octave-forge/patches/patch-ah b/math/octave-forge/patches/patch-ah
index 1a005d2064e..f5d355c86c5 100644
--- a/math/octave-forge/patches/patch-ah
+++ b/math/octave-forge/patches/patch-ah
@@ -1,506 +1,14 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/08/14 13:29:57 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.2 2004/10/30 06:56:04 dmcmahill Exp $
 
---- configure.orig	Wed Jul  7 17:52:52 2004
-+++ configure
-@@ -954,7 +954,7 @@ esac
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
--    cd "$ac_popdir"
-+    cd $ac_popdir
-   done
- fi
- 
-@@ -1885,7 +1885,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -1943,7 +1944,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2059,7 +2061,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2113,7 +2116,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2158,7 +2162,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2202,7 +2207,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2783,10 +2789,10 @@ else
- fi
- 
- 
--COPY_FLAGS="-fdp"
-+COPY_FLAGS="-Rfp"
- case "$canonical_host_type" in
--    powerpc-apple-darwin*)
--        COPY_FLAGS="-Rfp"
-+    *-*-linux*)
-+        COPY_FLAGS="-fdp"
-     ;;
- esac
- 
-@@ -3077,12 +3083,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
--
--if test "x$ac_path_x_has_been_run" != xyes; then
--  echo "$as_me:$LINENO: checking for X" >&5
-+echo "$as_me:$LINENO: checking for X" >&5
- echo $ECHO_N "checking for X... $ECHO_C" >&6
- 
--ac_path_x_has_been_run=yes
- 
- # Check whether --with-x or --without-x was given.
- if test "${with_x+set}" = set; then
-@@ -3175,7 +3178,7 @@ ac_x_header_dirs='
- /usr/openwin/share/include'
- 
- if test "$ac_x_includes" = no; then
--  # Guess where to find include files, by looking for a specified header file.
-+  # Guess where to find include files, by looking for Intrinsic.h.
-   # First, try using that file with no special directory specified.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3249,7 +3252,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3309,15 +3313,10 @@ else
-   # Update the cache value to reflect the command line values.
-   ac_cv_have_x="have_x=yes \
- 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
--  # It might be that x_includes is empty (headers are found in the
--  # standard search path. Then output the corresponding message
--  ac_out_x_includes=$x_includes
--  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
--  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
--echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
-+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
- fi
- 
--fi
- if test "$no_x" = yes; then
-   # Not all programs may use this symbol, but it does not hurt to define it.
- 
-@@ -3365,7 +3364,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3416,7 +3416,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3492,7 +3493,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3547,7 +3549,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3615,7 +3618,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3723,7 +3727,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3787,7 +3792,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3855,7 +3861,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3959,7 +3966,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4023,7 +4031,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4120,7 +4129,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4184,7 +4194,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4281,7 +4292,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4345,7 +4357,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4424,7 +4437,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5004,7 +5018,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5174,7 +5189,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5237,7 +5253,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5487,7 +5504,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5639,7 +5657,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5768,7 +5787,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5832,7 +5852,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5920,7 +5941,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6072,7 +6094,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6148,7 +6171,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6300,7 +6324,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6389,7 +6414,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6477,7 +6503,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6620,7 +6647,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6735,9 +6763,8 @@ fi
- 
- 	;;
-     esac
--    if test $have_term = yes; then
--       MISCDEFS="$MISCDEFS -DUSE_TERM -DHAVE_TERM_H"
--       STATUS=yes
-+    if test $have_termcap = yes; then
-+       MISCDEFS="$MISCDEFS -DUSE_TERM -DHAVE_TERMCAP_H"
-        echo "$as_me:$LINENO: checking for tgetnum in -ltermcap" >&5
- echo $ECHO_N "checking for tgetnum in -ltermcap... $ECHO_C" >&6
- if test "${ac_cv_lib_termcap_tgetnum+set}" = set; then
-@@ -6776,7 +6803,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6805,8 +6833,10 @@ if test $ac_cv_lib_termcap_tgetnum = yes
-   HAVE_LIB_TERMCAP=yes
- fi
- 
--    elif test $have_termcap = yes; then
--       MISCDEFS="$MISCDEFS -DUSE_TERM -DHAVE_TERMCAP_H"
-+       STATUS=yes
-+    elif test $have_term = yes; then
-+       MISCDEFS="$MISCDEFS -DUSE_TERM -DHAVE_TERM_H"
-+       STATUS=yes
-        echo "$as_me:$LINENO: checking for tgetnum in -ltermcap" >&5
- echo $ECHO_N "checking for tgetnum in -ltermcap... $ECHO_C" >&6
- if test "${ac_cv_lib_termcap_tgetnum+set}" = set; then
-@@ -6845,7 +6875,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6874,7 +6905,6 @@ if test $ac_cv_lib_termcap_tgetnum = yes
-   HAVE_LIB_TERMCAP=yes
- fi
- 
--       STATUS=yes
-     else
-        STATUS=no
-     fi
-@@ -7773,6 +7803,11 @@ esac
-   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-   esac
- 
-+  if test x"$ac_file" != x-; then
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    rm -f "$ac_file"
-+  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-@@ -7811,12 +7846,6 @@ echo "$as_me: error: cannot find input f
- 	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
--
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
+--- extra/mex/Makefile.orig	Thu Sep  9 11:53:25 2004
++++ extra/mex/Makefile
+@@ -24,7 +24,8 @@ $(MEXLIB): mex.cc mex.h matrix.h
+ 	$(MKOCTFILE) -c $(HAVE_OCTAVE_MAP_INDEX) -o $(MEXLIB) mex.cc
+ 
+ mex: mex.in
+-	cat mex.in | sed -e "s:@MKOCTFILE@:$(MKOCTFILE):;s:@LIBPATH@:$(LIBPATH):g;s:@MEXLIB@:$(MEXLIB):g" > mex
++	cat mex.in | sed -e "s:@MKOCTFILE@:$(MKOCTFILE):;s:@LIBPATH@:$(LIBPATH):g;s:@MEXLIB@:$(MEXLIB):g" \
++		-e 's;@_AWK_@;${AWK};g' > mex
+ 	chmod a+x mex
+ 
+ install:
diff --git a/math/octave-forge/patches/patch-ai b/math/octave-forge/patches/patch-ai
index 88ffc75f752..f7069517040 100644
--- a/math/octave-forge/patches/patch-ai
+++ b/math/octave-forge/patches/patch-ai
@@ -1,25 +1,13 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/08/14 13:29:57 dmcmahill Exp $
+$NetBSD: patch-ai,v 1.2 2004/10/30 06:56:04 dmcmahill Exp $
 
---- octinst.sh.in.orig	Wed Feb 25 05:48:03 2004
-+++ octinst.sh.in
-@@ -23,6 +23,7 @@ if test $# -ge 1; then altopath=$1; shif
- INSTALL="@INSTALL@"
- INSTALL_DATA="@INSTALL_DATA@"
- INSTALL_PROGRAM="@INSTALL_PROGRAM@"
-+INSTALL_SCRIPT="@INSTALL_SCRIPT@"
- MKPKGADD="@TOPDIR@/admin/mkpkgadd"
- COPY_FLAGS="@COPY_FLAGS@"
+--- Makeconf.base.orig	Thu Sep  9 11:53:24 2004
++++ Makeconf.base
+@@ -27,6 +27,8 @@ RANLIB = @RANLIB@
+ STRIP = @STRIP@
+ LN_S = @LN_S@
  
-@@ -86,5 +87,12 @@ files=`echo $source/bin/* | sed -e "s/[^
- if test "$files" != "$source/bin/*" ; then
-     $INSTALL -d $xpath
-     $INSTALL_PROGRAM $files $xpath
-+fi
++AWK = @AWK@
 +
-+# grab the executable files, skipping the CVS directory
-+files=`echo $source/scripts/* | sed -e "s/[^ ]*CVS//"`
-+if test "$files" != "$source/scripts/*" ; then
-+    $INSTALL -d $xpath
-+    $INSTALL_SCRIPT $files $xpath
- fi
- 
+ # Most octave programs will be compiled with $(MKOCTFILE).  Those which
+ # cannot use mkoctfile directly can request the flags that mkoctfile 
+ # would use as follows:
diff --git a/math/octave-forge/patches/patch-aj b/math/octave-forge/patches/patch-aj
new file mode 100644
index 00000000000..d82cf0fec22
--- /dev/null
+++ b/math/octave-forge/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2004/10/30 06:56:04 dmcmahill Exp $
+
+--- Makeconf.in.orig	Thu Sep  9 16:04:09 2004
++++ Makeconf.in
+@@ -27,6 +27,8 @@ RANLIB = @RANLIB@
+ STRIP = @STRIP@
+ LN_S = @LN_S@
+ 
++AWK = @AWK@
++
+ # Most octave programs will be compiled with $(MKOCTFILE).  Those which
+ # cannot use mkoctfile directly can request the flags that mkoctfile 
+ # would use as follows:
diff --git a/math/octave-forge/patches/patch-ak b/math/octave-forge/patches/patch-ak
new file mode 100644
index 00000000000..e8fce965788
--- /dev/null
+++ b/math/octave-forge/patches/patch-ak
@@ -0,0 +1,8 @@
+$NetBSD: patch-ak,v 1.1 2004/10/30 06:56:04 dmcmahill Exp $
+
+--- /dev/null	Mon Oct 18 18:37:34 2004
++++ extra/mex/Makeconf.add	Mon Oct 18 18:38:10 2004
+@@ -0,0 +1,3 @@
++
++AWK = @AWK@
++