Changes 2.9.1:

* use glpk
* improvements

10 files changed, 205 insertions, 77 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index dd874ee8269..41f5c9627d4 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.44 2005/03/22 09:24:29 adam Exp $
+# $NetBSD: Makefile,v 1.45 2005/04/01 10:15:19 adam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGNAME=	octave-current-${OCTAVE_VER}
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/ \
-		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/ \
-		ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/ \
-		ftp://ftp.task.gda.pl/pub/software/octave/
+MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \
+		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/ \
+		ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/bleeding-edge/ \
+		ftp://ftp.task.gda.pl/pub/software/octave/bleeding-edge/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
@@ -17,8 +17,8 @@ BUILD_DEPENDS+=	bison>=1.875:../../devel/bison
 BUILD_DEPENDS+=	gperf>=2.7:../../devel/gperf
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 
-OCTAVE_VER=	2.1.67
-CONFLICTS+=	octave-2.0.*
+OCTAVE_VER=	2.9.1
+CONFLICTS+=	octave-2.*
 
 .if (${MACHINE_ARCH} == "arm32")
 BROKEN=		Internal compiler error occurs on arm32 (even with gcc-2.95.3)
@@ -36,9 +36,13 @@ GCC_REQD=		3.0
 USE_LANGUAGES=		c c++ fortran
 
 # needed for loading of shared objects such as those in the
-# octave-forge package or user written ones compiled with
-# mkoctfile
+# octave-forge package or user written ones compiled with mkoctfile
 CONFIGURE_ARGS+=	--enable-dl
+# shared libraries are handled automatically in pkgsrc
+CONFIGURE_ARGS+=	--enable-static
+CONFIGURE_ARGS+=	--disable-shared
+
+.include "options.mk"
 
 INFO_FILES=	octave.info liboctave.info
 LIBOCTAVE_INFO=	liboctave.info liboctave.info-1 \
@@ -56,14 +60,12 @@ post-extract:
 	${MKDIR} ${WRKSRC}/src/pic
 
 # substitute in the real path to various bits of the toolchain because
-# mkoctfile will be used potentially by users and it needs to point
-# at the same compilers as were used in building octave.  We also
-# fix up the path to sed otherwise we end up with the buildlink directory
-# in mkoctfile
+# mkoctfile will be used potentially by users and it needs to point at the same
+# compilers as were used in building octave.  We also fix up the path to sed
+# otherwise we end up with the buildlink directory in mkoctfile
 post-build:
 	${MV} ${WRKSRC}/mkoctfile ${WRKSRC}/mkoctfile.bak
-	${SED} \
-		-e 's;"${CC}";"${CCPATH}";g' \
+	${SED}	-e 's;"${CC}";"${CCPATH}";g' \
 		-e 's;"${CXX}";"${CXXPATH}";g' \
 		-e 's;"${FC}";"${FCPATH}";g' \
 		-e 's@^:[ \t]*\$${SED=.*@: \$$\{SED="${SED}"\}@g' \
@@ -84,8 +86,8 @@ post-install:
 .endfor
 
 .include "../../audio/libsndfile/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../math/blas/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../math/lapack/buildlink3.mk"
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index 03eccacc758..5f407969054 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/03/22 09:24:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2005/04/01 10:15:19 adam Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
@@ -22,6 +22,7 @@ include/octave-${PKGVERSION}/octave/CDiagMatrix.h
 include/octave-${PKGVERSION}/octave/CMatrix.h
 include/octave-${PKGVERSION}/octave/CNDArray.h
 include/octave-${PKGVERSION}/octave/CRowVector.h
+include/octave-${PKGVERSION}/octave/CSparse.h
 include/octave-${PKGVERSION}/octave/Cell.h
 include/octave-${PKGVERSION}/octave/CmplxAEPBAL.h
 include/octave-${PKGVERSION}/octave/CmplxCHOL.h
@@ -61,6 +62,8 @@ include/octave-${PKGVERSION}/octave/MArrayN.cc
 include/octave-${PKGVERSION}/octave/MArrayN.h
 include/octave-${PKGVERSION}/octave/MDiagArray2.cc
 include/octave-${PKGVERSION}/octave/MDiagArray2.h
+include/octave-${PKGVERSION}/octave/MSparse-defs.h
+include/octave-${PKGVERSION}/octave/MSparse.h
 include/octave-${PKGVERSION}/octave/Matrix.h
 include/octave-${PKGVERSION}/octave/NLConst.h
 include/octave-${PKGVERSION}/octave/NLEqn-opts.h
@@ -76,6 +79,11 @@ include/octave-${PKGVERSION}/octave/QP.h
 include/octave-${PKGVERSION}/octave/Quad-opts.h
 include/octave-${PKGVERSION}/octave/Quad.h
 include/octave-${PKGVERSION}/octave/Range.h
+include/octave-${PKGVERSION}/octave/Sparse-op-defs.h
+include/octave-${PKGVERSION}/octave/Sparse.h
+include/octave-${PKGVERSION}/octave/SparseCmplxLU.h
+include/octave-${PKGVERSION}/octave/SparseType.h
+include/octave-${PKGVERSION}/octave/SparsedbleLU.h
 include/octave-${PKGVERSION}/octave/base-dae.h
 include/octave-${PKGVERSION}/octave/base-de.h
 include/octave-${PKGVERSION}/octave/base-list.h
@@ -84,6 +92,7 @@ include/octave-${PKGVERSION}/octave/base-lu.h
 include/octave-${PKGVERSION}/octave/base-min.h
 include/octave-${PKGVERSION}/octave/boolMatrix.h
 include/octave-${PKGVERSION}/octave/boolNDArray.h
+include/octave-${PKGVERSION}/octave/boolSparse.h
 include/octave-${PKGVERSION}/octave/byte-swap.h
 include/octave-${PKGVERSION}/octave/c-file-ptr-stream.h
 include/octave-${PKGVERSION}/octave/chMatrix.h
@@ -97,6 +106,7 @@ include/octave-${PKGVERSION}/octave/dDiagMatrix.h
 include/octave-${PKGVERSION}/octave/dMatrix.h
 include/octave-${PKGVERSION}/octave/dNDArray.h
 include/octave-${PKGVERSION}/octave/dRowVector.h
+include/octave-${PKGVERSION}/octave/dSparse.h
 include/octave-${PKGVERSION}/octave/data-conv.h
 include/octave-${PKGVERSION}/octave/dbleAEPBAL.h
 include/octave-${PKGVERSION}/octave/dbleCHOL.h
@@ -428,6 +438,7 @@ include/octave-${PKGVERSION}/octave/oct-rl-hist.h
 include/octave-${PKGVERSION}/octave/oct-shlib.h
 include/octave-${PKGVERSION}/octave/oct-sort.cc
 include/octave-${PKGVERSION}/octave/oct-sort.h
+include/octave-${PKGVERSION}/octave/oct-spparms.h
 include/octave-${PKGVERSION}/octave/oct-stdstrm.h
 include/octave-${PKGVERSION}/octave/oct-stream.h
 include/octave-${PKGVERSION}/octave/oct-strstrm.h
@@ -442,8 +453,10 @@ include/octave-${PKGVERSION}/octave/ov-base-mat.cc
 include/octave-${PKGVERSION}/octave/ov-base-mat.h
 include/octave-${PKGVERSION}/octave/ov-base-scalar.cc
 include/octave-${PKGVERSION}/octave/ov-base-scalar.h
+include/octave-${PKGVERSION}/octave/ov-base-sparse.h
 include/octave-${PKGVERSION}/octave/ov-base.h
 include/octave-${PKGVERSION}/octave/ov-bool-mat.h
+include/octave-${PKGVERSION}/octave/ov-bool-sparse.h
 include/octave-${PKGVERSION}/octave/ov-bool.h
 include/octave-${PKGVERSION}/octave/ov-builtin.h
 include/octave-${PKGVERSION}/octave/ov-cell.h
@@ -452,6 +465,7 @@ include/octave-${PKGVERSION}/octave/ov-colon.h
 include/octave-${PKGVERSION}/octave/ov-complex.h
 include/octave-${PKGVERSION}/octave/ov-cs-list.h
 include/octave-${PKGVERSION}/octave/ov-cx-mat.h
+include/octave-${PKGVERSION}/octave/ov-cx-sparse.h
 include/octave-${PKGVERSION}/octave/ov-dld-fcn.h
 include/octave-${PKGVERSION}/octave/ov-fcn-handle.h
 include/octave-${PKGVERSION}/octave/ov-fcn-inline.h
@@ -467,6 +481,7 @@ include/octave-${PKGVERSION}/octave/ov-list.h
 include/octave-${PKGVERSION}/octave/ov-mapper.h
 include/octave-${PKGVERSION}/octave/ov-range.h
 include/octave-${PKGVERSION}/octave/ov-re-mat.h
+include/octave-${PKGVERSION}/octave/ov-re-sparse.h
 include/octave-${PKGVERSION}/octave/ov-scalar.h
 include/octave-${PKGVERSION}/octave/ov-str-mat.h
 include/octave-${PKGVERSION}/octave/ov-streamoff.h
@@ -507,7 +522,6 @@ include/octave-${PKGVERSION}/octave/pt-jump.h
 include/octave-${PKGVERSION}/octave/pt-loop.h
 include/octave-${PKGVERSION}/octave/pt-mat.h
 include/octave-${PKGVERSION}/octave/pt-misc.h
-include/octave-${PKGVERSION}/octave/pt-plot.h
 include/octave-${PKGVERSION}/octave/pt-pr-code.h
 include/octave-${PKGVERSION}/octave/pt-select.h
 include/octave-${PKGVERSION}/octave/pt-stmt.h
@@ -517,7 +531,28 @@ include/octave-${PKGVERSION}/octave/pt.h
 include/octave-${PKGVERSION}/octave/quit.h
 include/octave-${PKGVERSION}/octave/sighandlers.h
 include/octave-${PKGVERSION}/octave/siglist.h
+include/octave-${PKGVERSION}/octave/smx-bm-sbm.h
+include/octave-${PKGVERSION}/octave/smx-cm-scm.h
+include/octave-${PKGVERSION}/octave/smx-cm-sm.h
+include/octave-${PKGVERSION}/octave/smx-cs-sm.h
+include/octave-${PKGVERSION}/octave/smx-m-scm.h
+include/octave-${PKGVERSION}/octave/smx-m-sm.h
+include/octave-${PKGVERSION}/octave/smx-s-scm.h
+include/octave-${PKGVERSION}/octave/smx-sbm-bm.h
+include/octave-${PKGVERSION}/octave/smx-scm-cm.h
+include/octave-${PKGVERSION}/octave/smx-scm-m.h
+include/octave-${PKGVERSION}/octave/smx-scm-s.h
+include/octave-${PKGVERSION}/octave/smx-scm-sm.h
+include/octave-${PKGVERSION}/octave/smx-sm-cm.h
+include/octave-${PKGVERSION}/octave/smx-sm-cs.h
+include/octave-${PKGVERSION}/octave/smx-sm-m.h
+include/octave-${PKGVERSION}/octave/smx-sm-scm.h
 include/octave-${PKGVERSION}/octave/so-array.h
+include/octave-${PKGVERSION}/octave/sparse-base-lu.cc
+include/octave-${PKGVERSION}/octave/sparse-base-lu.h
+include/octave-${PKGVERSION}/octave/sparse-sort.h
+include/octave-${PKGVERSION}/octave/sparse-xdiv.h
+include/octave-${PKGVERSION}/octave/sparse-xpow.h
 include/octave-${PKGVERSION}/octave/statdefs.h
 include/octave-${PKGVERSION}/octave/str-vec.h
 include/octave-${PKGVERSION}/octave/sun-utils.h
@@ -555,6 +590,15 @@ lib/liboctave.la
 lib/liboctinterp.la
 libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/info-emacs-info
 libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/info-emacs-octave-help
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/PKG_ADD
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__glpk__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_init__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_plot__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_raw__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_replot__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_set__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_show__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_splot__.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/airy.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/balance.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/besselh.oct
@@ -563,7 +607,12 @@ libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/besselj.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/besselk.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/bessely.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/betainc.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/builtin.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/cellfun.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/chol.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/clearplot.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/closeplot.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/colamd.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/colloc.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/daspk.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/daspk_options.oct
@@ -572,9 +621,12 @@ libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dasrt_options.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dassl.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dassl_options.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/det.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dispatch.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dispatch_help.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/eig.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/endgrent.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/endpwent.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/etree.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/expm.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fft.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fft2.oct
@@ -584,6 +636,7 @@ libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/filter.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/find.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fsolve.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fsolve_options.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/full.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gammainc.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gcd.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/getgrent.oct
@@ -595,12 +648,20 @@ libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/getpwuid.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/getrusage.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/givens.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gmtime.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gplot.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/graw.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gset.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gshow.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gsplot.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/hess.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/hold.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/ifft.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/ifft2.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/ifftn.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/inv.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/inverse.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/ishold.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/issparse.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/kron.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/localtime.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/lpsolve.oct
@@ -612,7 +673,10 @@ libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/max.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/min.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/minmax.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/mktime.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/nnz.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/nzmax.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/pinv.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/purge_tmp_files.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/qr.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/quad.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/quad_options.oct
@@ -623,11 +687,28 @@ libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/schur.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/setgrent.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/setpwent.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/sort.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/sparse.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spatan2.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spcumprod.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spcumsum.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spdet.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spdiag.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spfind.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spinv.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/splu.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spmax.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spmin.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spparms.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spprod.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spsum.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spsumsq.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/sqrtm.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/strftime.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/strptime.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/svd.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/syl.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/symamd.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/symbfact.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/time.oct
 libexec/octave/ls-R
 man/man1/mkoctfile.1
@@ -638,6 +719,7 @@ share/doc/html/octave/Octave-FAQ_1.html
 share/doc/html/octave/Octave-FAQ_10.html
 share/doc/html/octave/Octave-FAQ_11.html
 share/doc/html/octave/Octave-FAQ_12.html
+share/doc/html/octave/Octave-FAQ_13.html
 share/doc/html/octave/Octave-FAQ_2.html
 share/doc/html/octave/Octave-FAQ_3.html
 share/doc/html/octave/Octave-FAQ_4.html
@@ -726,6 +808,8 @@ share/doc/html/octave/octave_51.html
 share/doc/html/octave/octave_52.html
 share/doc/html/octave/octave_53.html
 share/doc/html/octave/octave_54.html
+share/doc/html/octave/octave_55.html
+share/doc/html/octave/octave_56.html
 share/doc/html/octave/octave_6.html
 share/doc/html/octave/octave_7.html
 share/doc/html/octave/octave_8.html
@@ -960,6 +1044,7 @@ share/octave/${PKGVERSION}/m/general/int2str.m
 share/octave/${PKGVERSION}/m/general/is_duplicate_entry.m
 share/octave/${PKGVERSION}/m/general/isa.m
 share/octave/${PKGVERSION}/m/general/isdefinite.m
+share/octave/${PKGVERSION}/m/general/isequal.m
 share/octave/${PKGVERSION}/m/general/isscalar.m
 share/octave/${PKGVERSION}/m/general/issquare.m
 share/octave/${PKGVERSION}/m/general/issymmetric.m
@@ -982,6 +1067,7 @@ share/octave/${PKGVERSION}/m/general/rotdim.m
 share/octave/${PKGVERSION}/m/general/rows.m
 share/octave/${PKGVERSION}/m/general/shift.m
 share/octave/${PKGVERSION}/m/general/shiftdim.m
+share/octave/${PKGVERSION}/m/general/sortrows.m
 share/octave/${PKGVERSION}/m/general/sph2cart.m
 share/octave/${PKGVERSION}/m/general/strerror.m
 share/octave/${PKGVERSION}/m/general/sub2ind.m
@@ -1054,6 +1140,8 @@ share/octave/${PKGVERSION}/m/miscellaneous/toc.m
 share/octave/${PKGVERSION}/m/miscellaneous/unix.m
 share/octave/${PKGVERSION}/m/miscellaneous/version.m
 share/octave/${PKGVERSION}/m/miscellaneous/xor.m
+share/octave/${PKGVERSION}/m/optimization/glpk.m
+share/octave/${PKGVERSION}/m/optimization/glpkmex.m
 share/octave/${PKGVERSION}/m/plot/PKG_ADD
 share/octave/${PKGVERSION}/m/plot/__axis_label__.m
 share/octave/${PKGVERSION}/m/plot/__errcomm__.m
@@ -1074,6 +1162,7 @@ share/octave/${PKGVERSION}/m/plot/__pltopt__.m
 share/octave/${PKGVERSION}/m/plot/axis.m
 share/octave/${PKGVERSION}/m/plot/bar.m
 share/octave/${PKGVERSION}/m/plot/bottom_title.m
+share/octave/${PKGVERSION}/m/plot/clg.m
 share/octave/${PKGVERSION}/m/plot/close.m
 share/octave/${PKGVERSION}/m/plot/contour.m
 share/octave/${PKGVERSION}/m/plot/errorbar.m
@@ -1091,6 +1180,7 @@ share/octave/${PKGVERSION}/m/plot/oneplot.m
 share/octave/${PKGVERSION}/m/plot/plot.m
 share/octave/${PKGVERSION}/m/plot/plot_border.m
 share/octave/${PKGVERSION}/m/plot/polar.m
+share/octave/${PKGVERSION}/m/plot/replot.m
 share/octave/${PKGVERSION}/m/plot/semilogx.m
 share/octave/${PKGVERSION}/m/plot/semilogxerr.m
 share/octave/${PKGVERSION}/m/plot/semilogy.m
@@ -1112,6 +1202,7 @@ share/octave/${PKGVERSION}/m/polynomial/poly.m
 share/octave/${PKGVERSION}/m/polynomial/polyder.m
 share/octave/${PKGVERSION}/m/polynomial/polyderiv.m
 share/octave/${PKGVERSION}/m/polynomial/polyfit.m
+share/octave/${PKGVERSION}/m/polynomial/polygcd.m
 share/octave/${PKGVERSION}/m/polynomial/polyinteg.m
 share/octave/${PKGVERSION}/m/polynomial/polyout.m
 share/octave/${PKGVERSION}/m/polynomial/polyreduce.m
@@ -1133,7 +1224,10 @@ share/octave/${PKGVERSION}/m/quaternion/quaternion.m
 share/octave/${PKGVERSION}/m/set/complement.m
 share/octave/${PKGVERSION}/m/set/create_set.m
 share/octave/${PKGVERSION}/m/set/intersection.m
+share/octave/${PKGVERSION}/m/set/ismember.m
+share/octave/${PKGVERSION}/m/set/setdiff.m
 share/octave/${PKGVERSION}/m/set/union.m
+share/octave/${PKGVERSION}/m/set/unique.m
 share/octave/${PKGVERSION}/m/signal/arch_fit.m
 share/octave/${PKGVERSION}/m/signal/arch_rnd.m
 share/octave/${PKGVERSION}/m/signal/arch_test.m
@@ -1170,6 +1264,20 @@ share/octave/${PKGVERSION}/m/signal/triangle_lw.m
 share/octave/${PKGVERSION}/m/signal/triangle_sw.m
 share/octave/${PKGVERSION}/m/signal/unwrap.m
 share/octave/${PKGVERSION}/m/signal/yulewalker.m
+share/octave/${PKGVERSION}/m/sparse/colperm.m
+share/octave/${PKGVERSION}/m/sparse/nonzeros.m
+share/octave/${PKGVERSION}/m/sparse/spalloc.m
+share/octave/${PKGVERSION}/m/sparse/spconvert.m
+share/octave/${PKGVERSION}/m/sparse/spdiags.m
+share/octave/${PKGVERSION}/m/sparse/speye.m
+share/octave/${PKGVERSION}/m/sparse/spfun.m
+share/octave/${PKGVERSION}/m/sparse/sphcat.m
+share/octave/${PKGVERSION}/m/sparse/spones.m
+share/octave/${PKGVERSION}/m/sparse/sprand.m
+share/octave/${PKGVERSION}/m/sparse/sprandn.m
+share/octave/${PKGVERSION}/m/sparse/spstats.m
+share/octave/${PKGVERSION}/m/sparse/spvcat.m
+share/octave/${PKGVERSION}/m/sparse/spy.m
 share/octave/${PKGVERSION}/m/specfun/bessel.m
 share/octave/${PKGVERSION}/m/specfun/beta.m
 share/octave/${PKGVERSION}/m/specfun/betai.m
@@ -1343,11 +1451,14 @@ share/octave/${PKGVERSION}/m/strings/isletter.m
 share/octave/${PKGVERSION}/m/strings/lower.m
 share/octave/${PKGVERSION}/m/strings/rindex.m
 share/octave/${PKGVERSION}/m/strings/split.m
+share/octave/${PKGVERSION}/m/strings/str2double.m
 share/octave/${PKGVERSION}/m/strings/str2mat.m
 share/octave/${PKGVERSION}/m/strings/str2num.m
 share/octave/${PKGVERSION}/m/strings/strcat.m
 share/octave/${PKGVERSION}/m/strings/strcmp.m
+share/octave/${PKGVERSION}/m/strings/strcmpi.m
 share/octave/${PKGVERSION}/m/strings/strjust.m
+share/octave/${PKGVERSION}/m/strings/strmatch.m
 share/octave/${PKGVERSION}/m/strings/strrep.m
 share/octave/${PKGVERSION}/m/strings/substr.m
 share/octave/${PKGVERSION}/m/strings/upper.m
@@ -1358,8 +1469,8 @@ share/octave/${PKGVERSION}/m/time/date.m
 share/octave/ls-R
 share/octave/site/m/startup/octaverc
 @dirrm share/octave/site/m/startup
-@dirrm share/octave/site/api-v13/m
-@dirrm share/octave/site/api-v13
+@dirrm share/octave/site/api-v14/m
+@dirrm share/octave/site/api-v14
 @dirrm share/octave/${PKGVERSION}/site/m
 @dirrm share/octave/${PKGVERSION}/site
 @dirrm share/octave/${PKGVERSION}/m/time
@@ -1372,11 +1483,13 @@ share/octave/site/m/startup/octaverc
 @dirrm share/octave/${PKGVERSION}/m/startup
 @dirrm share/octave/${PKGVERSION}/m/special-matrix
 @dirrm share/octave/${PKGVERSION}/m/specfun
+@dirrm share/octave/${PKGVERSION}/m/sparse
 @dirrm share/octave/${PKGVERSION}/m/signal
 @dirrm share/octave/${PKGVERSION}/m/set
 @dirrm share/octave/${PKGVERSION}/m/quaternion
 @dirrm share/octave/${PKGVERSION}/m/polynomial
 @dirrm share/octave/${PKGVERSION}/m/plot
+@dirrm share/octave/${PKGVERSION}/m/optimization
 @dirrm share/octave/${PKGVERSION}/m/miscellaneous
 @dirrm share/octave/${PKGVERSION}/m/linear-algebra
 @dirrm share/octave/${PKGVERSION}/m/io
@@ -1397,8 +1510,8 @@ share/octave/site/m/startup/octaverc
 @dirrm share/octave/${PKGVERSION}/doc
 @dirrm share/octave/${PKGVERSION}
 @dirrm share/doc/html/octave
-@dirrm libexec/octave/site/oct/api-v13/${MACHINE_GNU_PLATFORM}
-@dirrm libexec/octave/site/oct/api-v13
+@dirrm libexec/octave/site/oct/api-v14/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/site/oct/api-v14
 @dirrm libexec/octave/site/oct/${MACHINE_GNU_PLATFORM}
 @dirrm libexec/octave/site/oct
 @dirrm libexec/octave/site/exec/${MACHINE_GNU_PLATFORM}
diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index f216a900b95..497eed466d4 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.28 2005/03/26 18:56:21 adam Exp $
+$NetBSD: distinfo,v 1.29 2005/04/01 10:15:19 adam Exp $
 
-SHA1 (octave-2.1.67.tar.bz2) = 1f6eedbf28790d5d5863e940f200e09b0db03ec8
-RMD160 (octave-2.1.67.tar.bz2) = 6fe2e1393625e07169d73a253dbaafa181e62f84
-Size (octave-2.1.67.tar.bz2) = 5817032 bytes
-SHA1 (patch-aa) = e2d8591c222f3b67b5d9798ea349c4d4ce2eae91
-SHA1 (patch-ac) = 201e5e6a58f6934371daa9ccac8d4f1f01533a4c
-SHA1 (patch-ad) = d162862a0e45ddf15de438d8e7b0386ccfe7390e
+SHA1 (octave-2.9.1.tar.bz2) = 6c9ea48e014c39116a8525844c01ab4599731816
+RMD160 (octave-2.9.1.tar.bz2) = 61424c0c137dde2a991fc8454b623a154cf4bdda
+Size (octave-2.9.1.tar.bz2) = 6076652 bytes
+SHA1 (patch-aa) = 474c343f7ef3a3bc841f70936594356b2e11555a
+SHA1 (patch-ac) = 01431b785951d868c14ac1cd0b56ab16474f5901
+SHA1 (patch-ad) = 01d0fb5878897a91d33e2cb7cbc6d2575a04c464
 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111
-SHA1 (patch-af) = d40167a2469729969d4e52daeb9f6921dc37df78
-SHA1 (patch-ag) = 2d68c950f93ac67af4319368c55ca4edb96a61c3
+SHA1 (patch-af) = 957e6d1b58e5fd217ba49e8450a2a291789ae679
+SHA1 (patch-ag) = ab4ea66196487e4e5fac195b0f4867124dd60fe6
 SHA1 (patch-ah) = f7009d8b35354a1d403d5bdeae68a211435b004c
diff --git a/math/octave-current/octave.mk b/math/octave-current/octave.mk
index d07f631e2ec..17a148ab85c 100644
--- a/math/octave-current/octave.mk
+++ b/math/octave-current/octave.mk
@@ -1,5 +1,4 @@
-# $NetBSD: octave.mk,v 1.2 2004/11/25 12:59:21 adam Exp $
-#
+# $NetBSD: octave.mk,v 1.3 2005/04/01 10:15:19 adam Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -7,8 +6,7 @@ OCTAVE_CONFIG=	${LOCALBASE}/bin/octave-config
 
 # OCTAVE_VARS is a list of variables to define in the make environment.
 # This may be overridden in an octave add-on package Makefile.  
-#
-OCTAVE_VARS?=	LOCALVERFCNFILEDIR LOCALVEROCTFILEDIR  LOCALVERARCHLIBDIR VERSION
+OCTAVE_VARS?=	LOCALVERFCNFILEDIR LOCALVEROCTFILEDIR LOCALVERARCHLIBDIR VERSION
 
 # Set OCT_<var> to the value of <var> as returned by octave-config.
 .if !empty(PHASES_AFTER_EXTRACT:M${PKG_PHASE})
diff --git a/math/octave-current/options.mk b/math/octave-current/options.mk
new file mode 100644
index 00000000000..8dd829e1774
--- /dev/null
+++ b/math/octave-current/options.mk
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2005/04/01 10:15:19 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.octave
+PKG_DEFAULT_OPTIONS=	glpk hdf5
+PKG_SUPPORTED_OPTIONS=	glpk hdf5
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mglpk)
+.include "../../math/glpk/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-glpk
+.endif
+
+.if !empty(PKG_OPTIONS:Mhdf5)
+.include "../../devel/hdf5/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-hdf5
+.endif
diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa
index b1e9788e7fd..9d86193f580 100644
--- a/math/octave-current/patches/patch-aa
+++ b/math/octave-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2005/02/22 14:02:31 adam Exp $
+$NetBSD: patch-aa,v 1.12 2005/04/01 10:15:19 adam Exp $
 
---- configure.orig	2005-02-18 04:55:38.000000000 +0000
+--- configure.orig	2005-03-27 12:38:36.000000000 +0000
 +++ configure
-@@ -8824,7 +8824,7 @@ if $have_fortran_compiler; then
+@@ -9079,7 +9079,7 @@ if $have_fortran_compiler; then
  %.c : %.f
  
  %.o : %.f
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.11 2005/02/22 14:02:31 adam Exp $
  
  pic/%.o : %.f
  	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
-@@ -11034,7 +11034,7 @@ TEMPLATE_AR='$(AR)'
+@@ -11709,7 +11709,7 @@ TEMPLATE_AR='$(AR)'
  TEMPLATE_ARFLAGS="$ARFLAGS"
  library_path_var=LD_LIBRARY_PATH
  case "$canonical_host_type" in
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.11 2005/02/22 14:02:31 adam Exp $
      SH_LD=ld
      SH_LDFLAGS=-Bshareable
    ;;
-@@ -21138,19 +21138,19 @@ case "$canonical_host_type" in
+@@ -21162,19 +21162,19 @@ case "$canonical_host_type" in
      cat << \EOF > $bsd_gcc_kluge_targets_frag
  
  lex.o: lex.cc
diff --git a/math/octave-current/patches/patch-ac b/math/octave-current/patches/patch-ac
index c091eee65ec..080b7b1318e 100644
--- a/math/octave-current/patches/patch-ac
+++ b/math/octave-current/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2004/02/26 16:47:35 adam Exp $
+$NetBSD: patch-ac,v 1.5 2005/04/01 10:15:19 adam Exp $
 
---- Makeconf.in.orig	2004-02-16 19:57:21.000000000 +0000
+--- Makeconf.in.orig	2005-03-27 12:38:19.000000000 +0000
 +++ Makeconf.in
-@@ -71,7 +71,7 @@ SHLBIN = @SHLBIN@
+@@ -73,7 +73,7 @@ SHLBIN = @SHLBIN@
  SHLBIN_VER = @SHLBIN_VER@
  SHLLINKEXT=
  
@@ -11,7 +11,16 @@ $NetBSD: patch-ac,v 1.4 2004/02/26 16:47:35 adam Exp $
  
  # Fortran to C translator and associated flags.
  
-@@ -335,10 +335,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
+@@ -165,7 +165,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@
+ SH_LD = @SH_LD@
+ SH_LDFLAGS = @SH_LDFLAGS@
+ 
+-DL_LD = @DL_LD@
++DL_LD = ${LIBTOOL} --mode=link @DL_LD@
+ DL_LDFLAGS = @DL_LDFLAGS@
+ 
+ SONAME_FLAGS = @SONAME_FLAGS@
+@@ -344,10 +344,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
  # How to make .o files:
  
  %.o : %.c
diff --git a/math/octave-current/patches/patch-ad b/math/octave-current/patches/patch-ad
index 6436f11a08b..f9146a633b1 100644
--- a/math/octave-current/patches/patch-ad
+++ b/math/octave-current/patches/patch-ad
@@ -1,19 +1,19 @@
-$NetBSD: patch-ad,v 1.5 2005/02/22 14:02:31 adam Exp $
+$NetBSD: patch-ad,v 1.6 2005/04/01 10:15:19 adam Exp $
 
---- libcruft/Makefile.in.orig	2004-02-16 19:57:21.000000000 +0000
+--- libcruft/Makefile.in.orig	2005-03-09 15:22:58.000000000 +0000
 +++ libcruft/Makefile.in
-@@ -98,8 +98,8 @@ libraries: $(SUBDIRS)
+@@ -93,8 +93,8 @@ libraries: $(SUBDIRS)
  
  libcruft.$(LIBEXT): $(CRUFT_OBJ)
  	rm -f $@
 -	$(AR) $(ARFLAGS) $@ $^
 -	$(RANLIB) $@
 +	${LIBTOOL} --mode=link ${CC} -o libcruft.$(LIBEXT) $(CRUFT_OBJ:.o=.lo) \
-+		-rpath ${PREFIX}/lib -version-info ${version:2.1.%=2:%}
++		-rpath ${PREFIX}/lib -version-info ${version:2.9.%=2:%}
  
  libcruft.$(SHLEXT_VER): libcruft.$(SHLEXT)
  	rm -f $@
-@@ -124,9 +124,8 @@ install::
+@@ -119,9 +119,8 @@ install::
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
diff --git a/math/octave-current/patches/patch-af b/math/octave-current/patches/patch-af
index 6082177c77a..842d23d9582 100644
--- a/math/octave-current/patches/patch-af
+++ b/math/octave-current/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.8 2005/02/22 14:02:31 adam Exp $
+$NetBSD: patch-af,v 1.9 2005/04/01 10:15:19 adam Exp $
 
---- liboctave/Makefile.in.orig	2004-11-12 05:34:57.000000000 +0000
+--- liboctave/Makefile.in.orig	2005-03-15 20:54:12.000000000 +0000
 +++ liboctave/Makefile.in
-@@ -208,8 +208,9 @@ endif
+@@ -228,8 +228,9 @@ endif
  
  liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
  	rm -f $@
@@ -10,11 +10,11 @@ $NetBSD: patch-af,v 1.8 2005/02/22 14:02:31 adam Exp $
 -	$(RANLIB) $@
 +	${LIBTOOL} --mode=link ${CC} -o liboctave.$(LIBEXT) \
 +		$(LIBOCTAVE_OBJECTS:.o=.lo) -rpath ${PREFIX}/lib \
-+		-version-info ${version:2.1.%=2:%}
++		-version-info ${version:2.9.%=2:%}
  
  liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT)
  	rm -f $@
-@@ -236,9 +237,8 @@ install-lib:
+@@ -256,9 +257,8 @@ install-lib:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
diff --git a/math/octave-current/patches/patch-ag b/math/octave-current/patches/patch-ag
index 36fd1ae59df..2c82250d6b9 100644
--- a/math/octave-current/patches/patch-ag
+++ b/math/octave-current/patches/patch-ag
@@ -1,21 +1,8 @@
-$NetBSD: patch-ag,v 1.12 2005/02/22 14:02:31 adam Exp $
+$NetBSD: patch-ag,v 1.13 2005/04/01 10:15:19 adam Exp $
 
---- src/Makefile.in.orig	2004-11-12 05:34:58.000000000 +0000
+--- src/Makefile.in.orig	2005-03-27 12:38:21.000000000 +0000
 +++ src/Makefile.in
-@@ -32,10 +32,10 @@ CXXFLAGS_NO_PT_FLAGS = $(filter-out $(PT
- ifeq ($(ENABLE_DYNAMIC_LINKING), true)
-   ifdef CXXPICFLAG
-     %.oct : pic/%.o octave$(EXEEXT)
--	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS)
-+	  ${LIBTOOL} --mode=link $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS)
-   else
-     %.oct : %.o octave$(EXEEXT)
--	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS)
-+	  ${LIBTOOL} --mode=link $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS)
-   endif
- endif
- 
-@@ -267,8 +267,9 @@ libraries: $(LIBRARIES)
+@@ -284,8 +284,9 @@ libraries: $(LIBRARIES)
  
  liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
  	rm -f $@
@@ -23,11 +10,11 @@ $NetBSD: patch-ag,v 1.12 2005/02/22 14:02:31 adam Exp $
 -	$(RANLIB) $@
 +	${LIBTOOL} --mode=link ${CC} -o liboctinterp.$(LIBEXT) \
 +		$(OBJECTS:.o=.lo) $(XERBLA:.o=.lo) -rpath ${PREFIX}/lib \
-+		-version-info ${version:2.1.%=2:%}
++		-version-info ${version:2.9.%=2:%}
  
  liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT)
  	rm -f $@
-@@ -276,7 +277,7 @@ liboctinterp.$(SHLEXT_VER): liboctinterp
+@@ -293,7 +294,7 @@ liboctinterp.$(SHLEXT_VER): liboctinterp
  
  liboctinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
  	rm -f $@
@@ -36,7 +23,7 @@ $NetBSD: patch-ag,v 1.12 2005/02/22 14:02:31 adam Exp $
  
  stamp-oct-links: $(OCT_FILES)
  	if [ -n "$(OCT_FILES)" ]; then \
-@@ -288,6 +289,7 @@ stamp-prereq: defaults.h oct-conf.h oct-
+@@ -305,6 +306,7 @@ stamp-prereq: defaults.h oct-conf.h oct-
  	touch stamp-prereq
  
  octave$(EXEEXT): stamp-prereq $(LIBRARIES) main.o $(DLD_STATIC_OBJ)
@@ -44,7 +31,7 @@ $NetBSD: patch-ag,v 1.12 2005/02/22 14:02:31 adam Exp $
  	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
  	$(ALL_LDFLAGS) -o $@ \
  	main.o $(DLD_STATIC_OBJ) \
-@@ -368,6 +370,7 @@ install-strip:
+@@ -391,6 +393,7 @@ install-strip:
  install-bin:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  	rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
@@ -52,15 +39,15 @@ $NetBSD: patch-ag,v 1.12 2005/02/22 14:02:31 adam Exp $
  	$(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
  	$(LN_S) octave-$(version)$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT)
  .PHONY: install-bin
-@@ -377,6 +380,7 @@ install-oct:
- 	  $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octfiledir); \
+@@ -401,6 +404,7 @@ install-oct: PKG_ADD
+ 	if [ -n "$(OCT_FILES)" ]; then \
  	  xfiles="$(OCT_FILES)"; \
  	  for f in $$xfiles; do \
 +	    ${LIBTOOL} --mode=install \
  	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \
  	  done; \
  	  $(srcdir)/mk-oct-links $(DESTDIR)$(octfiledir) $(DLD_DEF_FILES); \
-@@ -387,9 +391,8 @@ install-lib:
+@@ -411,9 +415,8 @@ install-lib:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \