Changes 2006.03.17:

* statistics/regress: new function
* general bug fixes and improvements (see ChangeLog for details)
* audio/waveread: big-endian fix; 2-channel file fix
* comm/galois: fix rank calculation for galois array
* general/interp2: cubic interpolation
* image/: return MxNx3 matrices of appropriate numeric class
* io/textread: faster
* io/dlmwrite: control precision and line separator; allow append
* miscellaneous/mfilename: compatibility function
* miscellaneous/listen: subnet patterns; loopback support
* NaN/xcovf: missing data xcorr
* octcdf/: support for netcdf files
* optim/wpolyfit: return row vector; allow centering and scaling
* plot/legend: fix error on first call
* plot/print: add PDF option
* signal/residued,residuez: partial fraction expansion of filters
* signal/qp_kaiser: PPN filter bank coefficients
* statistics/histfit: allow negative data
* statistics/mvnpdf,mvnrnd: multivariate normal distribution
* tsa/: improved speed, style and docs
* tsa/amarma: adaptive mean ARMA modeling
* tsa/y2res: add entropy estimation; add equidistant quantisation
* tsa/mvfreqz: add PDCF
* support for 2.9.4
* support for 64-bit indexing
* support for MinGW build

6 files changed, 92 insertions, 80 deletions

diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index e018f45d4dd..e59c162ab50 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2006/04/17 13:46:39 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/20 18:16:47 adam Exp $
 
-DISTNAME=	octave-forge-2005.06.13
-PKGREVISION=	2
+DISTNAME=	octave-forge-2006.03.17
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=octave/}
 
diff --git a/math/octave-forge/PLIST b/math/octave-forge/PLIST
index e5b3043e22c..ec50832ff45 100644
--- a/math/octave-forge/PLIST
+++ b/math/octave-forge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/08/04 13:12:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/20 18:16:47 adam Exp $
 bin/mex
 man/man1/mex.1
 share/octave/${OCT_VERSION}/site/octave-forge-alternatives/m/graceplot/PKG_ADD
@@ -223,6 +223,7 @@ ${OCT_LOCALVEROCTFILEDIR}/octave-forge/matrix.h
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/medfilt1.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/mex.h
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/mex.o
+${OCT_LOCALVEROCTFILEDIR}/octave-forge/mfilename.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/newtonstep.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/nnz.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/numgradient.oct
@@ -261,6 +262,7 @@ ${OCT_LOCALVEROCTFILEDIR}/octave-forge/synchrotron_1.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/synchrotron_2.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/syndtable.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/taylorcoeff.oct
+${OCT_LOCALVEROCTFILEDIR}/octave-forge/textread.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/transport_2.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/transport_3.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/transport_4.oct
@@ -370,28 +372,24 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/prettyprint_c.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/scale_data.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/sum_moments_nodes.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/unscale_parameters.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/bicubic.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/blkdiag.m
-${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/char.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/complex.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/cplxpair.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/ctranspose.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/cumtrapz.m
-${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/deal.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/del2.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/dos.m
-${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/double.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/fcnchk.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/gradient.m
 ${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/isdir.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
@@ -519,7 +517,6 @@ ${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
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/io/xlsread.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/irsa/irsa_act.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/irsa/irsa_actcore.m
@@ -557,7 +554,20 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/rotv.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/slurp_file.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/temp_name.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/test_inline_1.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/units.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/xmlwrite.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/octcdf/example_netcdf.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/octcdf/example_opendap.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/octcdf/ncbyte.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/octcdf/ncchar.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/octcdf/ncdouble.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/octcdf/ncdump.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/octcdf/ncfloat.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/octcdf/ncint.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/octcdf/nclong.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/octcdf/ncshort.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/octcdf/nctest.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/octcdf/netcdf_setup.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/ode/ode23.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/ode/ode45.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/ode/ode78.m
@@ -712,9 +722,12 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/polystab.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/pulstran.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/pwelch.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/pyulear.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/qp_kaiser.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/rceps.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/rectpuls.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/resample.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/residued.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/residuez.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/sftrans.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/sgolay.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/sgolayfilt.m
@@ -790,6 +803,8 @@ ${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/mvnpdf.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/mvnrnd.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/nanmax.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/nanmean.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/statistics/nanmedian.m
@@ -800,30 +815,25 @@ ${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/regress.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
-${OCT_LOCALVERFCNFILEDIR}/octave-forge/strings/cellstr.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/strings/mat2str.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/strings/str2double.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/strings/strcmpi.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/strings/strfind.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/strings/strmatch.m
-${OCT_LOCALVERFCNFILEDIR}/octave-forge/strings/strncmp.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/strings/strncmpi.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/strings/strsort.m
 ${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
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/symband/BandToFull.m
@@ -860,6 +870,7 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/ac2rc.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/acorf.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/acovf.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/adim.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/amarma.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/ar2poly.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/ar2rc.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/tsa/ar_spa.m
@@ -911,11 +922,16 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/defSpeakSphere.wrl
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/proplan.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/save_vrml.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/select_3D_points.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/test_moving_surf.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/test_vmesh.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/test_vrml_faces.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vmesh.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_Background.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_DirectionalLight.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_PointLight.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_ROUTE.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_TimeSensor.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_anim.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_arrow.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_browse.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_cyl.m
@@ -929,8 +945,10 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_flatten.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_frame.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_group.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_kill.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_interp.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_lines.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_material.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_newname.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_parallelogram.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_points.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_select_points.m
@@ -958,6 +976,7 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_transfo.m
 @dirrm ${OCT_LOCALVERFCNFILEDIR}/octave-forge/path
 @dirrm ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim
 @dirrm ${OCT_LOCALVERFCNFILEDIR}/octave-forge/ode
+@dirrm ${OCT_LOCALVERFCNFILEDIR}/octave-forge/octcdf
 @dirrm ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous
 @dirrm ${OCT_LOCALVERFCNFILEDIR}/octave-forge/mex
 @dirrm ${OCT_LOCALVERFCNFILEDIR}/octave-forge/mapping
diff --git a/math/octave-forge/distinfo b/math/octave-forge/distinfo
index 883a1d4290a..e0dc4dd6f5f 100644
--- a/math/octave-forge/distinfo
+++ b/math/octave-forge/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2005/08/23 12:44:54 dmcmahill Exp $
+$NetBSD: distinfo,v 1.11 2006/04/20 18:16:47 adam Exp $
 
-SHA1 (octave-forge-2005.06.13.tar.gz) = e2f1f4777e87017322f8b25789c2688402933805
-RMD160 (octave-forge-2005.06.13.tar.gz) = 4666543da2a542fd9a0f8b1c7c95be70824cff81
-Size (octave-forge-2005.06.13.tar.gz) = 3680082 bytes
-SHA1 (patch-ag) = 2b9975da303c3a3a10af7f42fb9e8f943a8e5368
+SHA1 (octave-forge-2006.03.17.tar.gz) = fca78a6eee1a2d44d2441c9ed9d3ffe3c51689de
+RMD160 (octave-forge-2006.03.17.tar.gz) = 0875f4ea9c7d4f3b9b0834decdbf590fe5166fa6
+Size (octave-forge-2006.03.17.tar.gz) = 3727272 bytes
+SHA1 (patch-ag) = 79fa60ff62548aac9293bc5f040fd0145b85720c
 SHA1 (patch-ak) = 49c63b4b2a92cb971410f325a077152d7b5ebcd8
-SHA1 (patch-al) = 716612d9cb33c4f384f1d40c5c48943e6f71b84e
-SHA1 (patch-am) = 1fdabbb07dee8046a3c0b39aee954f417c0173ae
+SHA1 (patch-al) = d6925ebcc11ea5ad0dfa9be0df614a74c7fa31d0
+SHA1 (patch-am) = b0d22c174963ed797c4c4753957f19959ee87469
diff --git a/math/octave-forge/patches/patch-ag b/math/octave-forge/patches/patch-ag
index 2bdbcd2a1cd..6ae5739deac 100644
--- a/math/octave-forge/patches/patch-ag
+++ b/math/octave-forge/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
+$NetBSD: patch-ag,v 1.5 2006/04/20 18:16:47 adam Exp $
 
---- configure.orig	2005-06-13 06:10:01.000000000 +0000
+--- configure.orig	2006-03-17 06:26:16.000000000 +0100
 +++ configure
 @@ -954,7 +954,7 @@ esac
      else
@@ -71,7 +71,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3079,12 +3085,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -3102,12 +3108,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -85,7 +85,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
  
  # Check whether --with-x or --without-x was given.
  if test "${with_x+set}" = set; then
-@@ -3177,7 +3180,7 @@ ac_x_header_dirs='
+@@ -3200,7 +3203,7 @@ ac_x_header_dirs='
  /usr/openwin/share/include'
  
  if test "$ac_x_includes" = no; then
@@ -94,7 +94,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    # First, try using that file with no special directory specified.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3251,7 +3254,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3274,7 +3277,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -104,7 +104,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3311,15 +3315,10 @@ else
+@@ -3334,15 +3338,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"
@@ -122,7 +122,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
  if test "$no_x" = yes; then
    # Not all programs may use this symbol, but it does not hurt to define it.
  
-@@ -3367,7 +3366,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3390,7 +3389,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -132,7 +132,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3418,7 +3418,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3441,7 +3441,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -142,7 +142,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3494,7 +3495,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3517,7 +3518,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -152,7 +152,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3549,7 +3551,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3572,7 +3574,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -162,7 +162,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3617,7 +3620,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3640,7 +3643,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -172,7 +172,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3725,7 +3729,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3748,7 +3752,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -182,7 +182,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3789,7 +3794,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3812,7 +3817,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -192,7 +192,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3857,7 +3863,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3880,7 +3886,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -202,7 +202,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3961,7 +3968,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3984,7 +3991,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -212,7 +212,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4025,7 +4033,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4048,7 +4056,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -222,7 +222,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4122,7 +4131,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4145,7 +4154,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -232,7 +232,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4186,7 +4196,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4209,7 +4219,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -242,7 +242,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4283,7 +4294,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4306,7 +4317,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -252,7 +252,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4347,7 +4359,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4370,7 +4382,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -262,7 +262,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4426,7 +4439,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4449,7 +4462,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -272,7 +272,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5089,6 +5103,48 @@ done
+@@ -5136,6 +5150,48 @@ done
  
  
  
@@ -321,7 +321,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
  if test -e main/audio/NOINSTALL ; then
  
  		STATUS=noinstall
-@@ -5147,7 +5203,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5194,7 +5250,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -331,7 +331,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5317,7 +5374,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5364,7 +5421,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -341,7 +341,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5380,7 +5438,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5427,7 +5485,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -351,7 +351,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5630,7 +5689,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5721,7 +5780,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -361,7 +361,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5783,7 +5843,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -5874,7 +5934,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -371,7 +371,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5916,7 +5977,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -6007,7 +6068,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -381,7 +381,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5991,7 +6053,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -6082,7 +6144,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -391,7 +391,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6069,7 +6132,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -6160,7 +6223,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -401,7 +401,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6161,7 +6225,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6252,7 +6316,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -411,7 +411,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6314,7 +6379,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -6405,7 +6470,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -421,7 +421,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6392,7 +6458,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6483,7 +6549,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -431,7 +431,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6545,7 +6612,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -6636,7 +6703,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -441,7 +441,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6724,7 +6792,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6771,7 +6839,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -451,7 +451,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6867,7 +6936,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6859,7 +6928,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -461,7 +461,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7023,7 +7093,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -7002,7 +7072,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -471,7 +471,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8321,6 +8392,11 @@ esac
+@@ -8891,6 +8962,11 @@ esac
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -483,7 +483,7 @@ $NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
    # 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.  */
-@@ -8359,12 +8435,6 @@ echo "$as_me: error: cannot find input f
+@@ -8929,12 +9005,6 @@ echo "$as_me: error: cannot find input f
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
diff --git a/math/octave-forge/patches/patch-al b/math/octave-forge/patches/patch-al
index ec7863ec595..7c3ff75fa29 100644
--- a/math/octave-forge/patches/patch-al
+++ b/math/octave-forge/patches/patch-al
@@ -1,12 +1,8 @@
-$NetBSD: patch-al,v 1.1 2005/03/14 04:08:42 dmcmahill Exp $
+$NetBSD: patch-al,v 1.2 2006/04/20 18:16:47 adam Exp $
 
-sometimes X_LIBS ends up with "-Rpath" in it but mkoctfile doesn't
-understand that (yet).  In an upcoming octave-current release, that
-should be fixed.
-
---- main/plot/Makefile.orig	2004-01-12 02:39:09.000000000 -0500
+--- main/plot/Makefile.orig	2006-03-12 21:39:09.000000000 +0100
 +++ main/plot/Makefile
-@@ -9,6 +9,7 @@ ifndef OCTAVE_FORGE
+@@ -11,6 +11,7 @@ ifndef OCTAVE_FORGE
  	X_LIBS = -L/usr/X11R6/lib
  endif
  
@@ -14,7 +10,7 @@ should be fixed.
  
  %.o: %.cc ; $(MKOCTFILE) -c $(X_CFLAGS) $<
  
-@@ -22,16 +23,16 @@ endif
+@@ -24,16 +25,16 @@ endif
  $(PROGS:.oct=.o): graphics.h
  
  grab.oct: grab.o graphics.o
@@ -33,5 +29,5 @@ should be fixed.
 -	$(MKOCTFILE) $< graphics.o $(X_LIBS) -o $@
 +	$(MKOCTFILE) $< graphics.o $(X_LIBS2) -o $@
  
- clean: ; -$(RM) *.o octave-core core *~ *.oct
- 
+ %.m : %.m.in
+ 	-$(INSTALL) $< $@
diff --git a/math/octave-forge/patches/patch-am b/math/octave-forge/patches/patch-am
index 1099a783e8c..0c1316b634a 100644
--- a/math/octave-forge/patches/patch-am
+++ b/math/octave-forge/patches/patch-am
@@ -1,12 +1,10 @@
-$NetBSD: patch-am,v 1.1 2005/08/06 18:39:03 rillig Exp $
+$NetBSD: patch-am,v 1.2 2006/04/20 18:16:47 adam Exp $
 
-Work around an undefined reference to close(2).
-
---- extra/pdb/creadpdb.cc.orig	Tue May 24 23:36:40 2005
-+++ extra/pdb/creadpdb.cc	Sat Aug  6 20:35:08 2005
-@@ -19,6 +19,7 @@
- #include <octave/ov-str-mat.h>
- #include <sys/mman.h>
+--- extra/pdb/creadpdb.cc.orig	2006-01-08 06:47:57.000000000 +0100
++++ extra/pdb/creadpdb.cc
+@@ -21,6 +21,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
  #include <fcntl.h>
 +#include <unistd.h>