From 95a329b89e49b840765b4395e1ac7c05a42605b9 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Wed, 19 Sep 2007 18:09:16 +0000
Subject: update to 2.9.14 (pre-release for 3.0) too many changes to list here
 pkgsrc changes: -add use of pcre and qhull to options, and include  both in
 the default configuration -play dirty tricks to make sure GNU sed is used as
 sed -- there is  something in the "mkf77def" script which doesn't work with
 NetBSD sed

---
 math/octave-current/Makefile         |  18 +-
 math/octave-current/PLIST            | 547 +++++++++++++++++++++--------------
 math/octave-current/distinfo         |  22 +-
 math/octave-current/options.mk       |  18 +-
 math/octave-current/patches/patch-aa |  27 +-
 math/octave-current/patches/patch-ab |   6 +-
 math/octave-current/patches/patch-ac |  12 +-
 math/octave-current/patches/patch-ad |  24 +-
 math/octave-current/patches/patch-ae |   8 +-
 math/octave-current/patches/patch-af |  24 +-
 math/octave-current/patches/patch-ag |  47 +--
 11 files changed, 442 insertions(+), 311 deletions(-)

(limited to 'math')

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index d8d48d7587b..7c48ba71491 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2007/01/07 12:25:54 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2007/09/19 18:09:16 drochner Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGNAME=	octave-current-${OCTAVE_VER}
-PKGREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/ \
@@ -18,7 +17,7 @@ BUILD_DEPENDS+=	bison>=1.875:../../devel/bison
 BUILD_DEPENDS+=	gperf>=2.7:../../devel/gperf
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 
-OCTAVE_VER=	2.9.4
+OCTAVE_VER=	2.9.14
 CONFLICTS+=	octave-2.*
 
 .if (${MACHINE_ARCH} == "arm32")
@@ -27,8 +26,9 @@ BROKEN=		Internal compiler error occurs on arm32 (even with gcc-2.95.3)
 
 USE_GNU_READLINE=	yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake makeinfo perl
+USE_TOOLS+=		gmake makeinfo perl gsed
 GNU_CONFIGURE=		yes
+USE_DIRS+=		xdg-1.1
 
 GCC_REQD+=		3.0
 USE_LANGUAGES=		c c++ fortran
@@ -40,6 +40,9 @@ CONFIGURE_ARGS+=	--enable-dl
 CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ARGS+=	--disable-shared
 
+# trick pkgsrc into real gsed, needed for "mkf77def"
+TOOLS_PLATFORM.gsed=	#empty
+
 .include "options.mk"
 
 GNU_PLATFORM_DIR!=	${.CURDIR}/../../mk/gnu-config/config.sub ${MACHINE_GNU_PLATFORM}
@@ -49,8 +52,6 @@ INFO_FILES=	# PLIST
 OCTAVE_DOC=	faq/Octave-FAQ.ps interpreter/octave.ps \
 		liboctave/liboctave.ps refcard/refcard-a4.ps \
 		refcard/refcard-legal.ps  refcard/refcard-letter.ps
-OCTAVE_HTML=	faq/Octave-FAQ_*.html interpreter/octave_*.html \
-		liboctave/liboctave_*.html
 
 UNWRAP_FILES+=	mkoctfile octave-bug src/oct-conf.h
 
@@ -70,6 +71,7 @@ post-build:
 		-e 's@^:[ \t]*\$${SED=.*@: \$$\{SED="${SED}"\}@g' \
 		${WRKSRC}/mkoctfile.bak > ${WRKSRC}/mkoctfile
 	${CHMOD} a+x ${WRKSRC}/mkoctfile
+	(cd ${WRKSRC}/doc/interpreter && ${GMAKE} octave.ps)
 
 post-install:
 	cd ${WRKSRC}/doc/liboctave;					\
@@ -81,10 +83,6 @@ post-install:
 .for f in ${OCTAVE_DOC}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/octave/${OCTAVE_VER}/doc
 .endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/octave
-.for f in ${OCTAVE_HTML}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/html/octave
-.endfor
 
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index 5c67eff65f5..4884a2759e5 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,13 +1,12 @@
-@comment $NetBSD: PLIST,v 1.21 2006/03/20 18:15:38 jlam Exp $
-bin/mkoctfile-${PKGVERSION}
+@comment $NetBSD: PLIST,v 1.22 2007/09/19 18:09:16 drochner Exp $
 bin/mkoctfile
+bin/mkoctfile-${PKGVERSION}
 bin/octave
 bin/octave-${PKGVERSION}
 bin/octave-bug
 bin/octave-bug-${PKGVERSION}
 bin/octave-config
 bin/octave-config-${PKGVERSION}
-include/octave-${PKGVERSION}/octave/Array-flags.h
 include/octave-${PKGVERSION}/octave/Array-util.h
 include/octave-${PKGVERSION}/octave/Array.cc
 include/octave-${PKGVERSION}/octave/Array.h
@@ -65,6 +64,7 @@ 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/MatrixType.h
 include/octave-${PKGVERSION}/octave/NLConst.h
 include/octave-${PKGVERSION}/octave/NLEqn-opts.h
 include/octave-${PKGVERSION}/octave/NLEqn.h
@@ -83,7 +83,8 @@ include/octave-${PKGVERSION}/octave/Sparse-op-defs.h
 include/octave-${PKGVERSION}/octave/Sparse.h
 include/octave-${PKGVERSION}/octave/SparseCmplxCHOL.h
 include/octave-${PKGVERSION}/octave/SparseCmplxLU.h
-include/octave-${PKGVERSION}/octave/SparseType.h
+include/octave-${PKGVERSION}/octave/SparseCmplxQR.h
+include/octave-${PKGVERSION}/octave/SparseQR.h
 include/octave-${PKGVERSION}/octave/SparsedbleCHOL.h
 include/octave-${PKGVERSION}/octave/SparsedbleLU.h
 include/octave-${PKGVERSION}/octave/base-dae.h
@@ -132,9 +133,9 @@ include/octave-${PKGVERSION}/octave/f77-fcn.h
 include/octave-${PKGVERSION}/octave/file-io.h
 include/octave-${PKGVERSION}/octave/file-ops.h
 include/octave-${PKGVERSION}/octave/file-stat.h
-include/octave-${PKGVERSION}/octave/fn-cache.h
 include/octave-${PKGVERSION}/octave/getopt.h
 include/octave-${PKGVERSION}/octave/glob-match.h
+include/octave-${PKGVERSION}/octave/graphics.h
 include/octave-${PKGVERSION}/octave/gripes.h
 include/octave-${PKGVERSION}/octave/help.h
 include/octave-${PKGVERSION}/octave/idx-vector.h
@@ -152,9 +153,9 @@ include/octave-${PKGVERSION}/octave/lo-error.h
 include/octave-${PKGVERSION}/octave/lo-ieee.h
 include/octave-${PKGVERSION}/octave/lo-mappers.h
 include/octave-${PKGVERSION}/octave/lo-specfun.h
-include/octave-${PKGVERSION}/octave/lo-sstream.h
 include/octave-${PKGVERSION}/octave/lo-sysdep.h
 include/octave-${PKGVERSION}/octave/lo-utils.h
+include/octave-${PKGVERSION}/octave/load-path.h
 include/octave-${PKGVERSION}/octave/load-save.h
 include/octave-${PKGVERSION}/octave/ls-hdf5.h
 include/octave-${PKGVERSION}/octave/ls-mat-ascii.h
@@ -164,6 +165,9 @@ include/octave-${PKGVERSION}/octave/ls-oct-ascii.h
 include/octave-${PKGVERSION}/octave/ls-oct-binary.h
 include/octave-${PKGVERSION}/octave/ls-utils.h
 include/octave-${PKGVERSION}/octave/mach-info.h
+include/octave-${PKGVERSION}/octave/md5.h
+include/octave-${PKGVERSION}/octave/mex.h
+include/octave-${PKGVERSION}/octave/mexproto.h
 include/octave-${PKGVERSION}/octave/mx-base.h
 include/octave-${PKGVERSION}/octave/mx-cdm-cm.h
 include/octave-${PKGVERSION}/octave/mx-cdm-cs.h
@@ -416,9 +420,11 @@ include/octave-${PKGVERSION}/octave/mx-ui8nda-ui32.h
 include/octave-${PKGVERSION}/octave/mx-ui8nda-ui32nda.h
 include/octave-${PKGVERSION}/octave/mx-ui8nda-ui64.h
 include/octave-${PKGVERSION}/octave/mx-ui8nda-ui64nda.h
+include/octave-${PKGVERSION}/octave/mxarray.h
 include/octave-${PKGVERSION}/octave/oct-alloc.h
 include/octave-${PKGVERSION}/octave/oct-cmplx.h
 include/octave-${PKGVERSION}/octave/oct-conf.h
+include/octave-${PKGVERSION}/octave/oct-dlldefs.h
 include/octave-${PKGVERSION}/octave/oct-env.h
 include/octave-${PKGVERSION}/octave/oct-errno.h
 include/octave-${PKGVERSION}/octave/oct-fftw.h
@@ -431,6 +437,7 @@ include/octave-${PKGVERSION}/octave/oct-inttypes.h
 include/octave-${PKGVERSION}/octave/oct-iostrm.h
 include/octave-${PKGVERSION}/octave/oct-lvalue.h
 include/octave-${PKGVERSION}/octave/oct-map.h
+include/octave-${PKGVERSION}/octave/oct-md5.h
 include/octave-${PKGVERSION}/octave/oct-obj.h
 include/octave-${PKGVERSION}/octave/oct-passwd.h
 include/octave-${PKGVERSION}/octave/oct-prcstrm.h
@@ -449,6 +456,7 @@ include/octave-${PKGVERSION}/octave/oct-strstrm.h
 include/octave-${PKGVERSION}/octave/oct-syscalls.h
 include/octave-${PKGVERSION}/octave/oct-time.h
 include/octave-${PKGVERSION}/octave/oct-types.h
+include/octave-${PKGVERSION}/octave/oct-uname.h
 include/octave-${PKGVERSION}/octave/oct.h
 include/octave-${PKGVERSION}/octave/octave.h
 include/octave-${PKGVERSION}/octave/ops.h
@@ -483,6 +491,7 @@ include/octave-${PKGVERSION}/octave/ov-int8.h
 include/octave-${PKGVERSION}/octave/ov-intx.h
 include/octave-${PKGVERSION}/octave/ov-list.h
 include/octave-${PKGVERSION}/octave/ov-mapper.h
+include/octave-${PKGVERSION}/octave/ov-mex-fcn.h
 include/octave-${PKGVERSION}/octave/ov-range.h
 include/octave-${PKGVERSION}/octave/ov-re-mat.h
 include/octave-${PKGVERSION}/octave/ov-re-sparse.h
@@ -497,7 +506,6 @@ include/octave-${PKGVERSION}/octave/ov-uint32.h
 include/octave-${PKGVERSION}/octave/ov-uint64.h
 include/octave-${PKGVERSION}/octave/ov-uint8.h
 include/octave-${PKGVERSION}/octave/ov-usr-fcn.h
-include/octave-${PKGVERSION}/octave/ov-va-args.h
 include/octave-${PKGVERSION}/octave/ov.h
 include/octave-${PKGVERSION}/octave/pager.h
 include/octave-${PKGVERSION}/octave/parse.h
@@ -533,6 +541,9 @@ include/octave-${PKGVERSION}/octave/pt-unop.h
 include/octave-${PKGVERSION}/octave/pt-walk.h
 include/octave-${PKGVERSION}/octave/pt.h
 include/octave-${PKGVERSION}/octave/quit.h
+include/octave-${PKGVERSION}/octave/randgamma.h
+include/octave-${PKGVERSION}/octave/randmtzig.h
+include/octave-${PKGVERSION}/octave/randpoisson.h
 include/octave-${PKGVERSION}/octave/sighandlers.h
 include/octave-${PKGVERSION}/octave/siglist.h
 include/octave-${PKGVERSION}/octave/smx-bm-sbm.h
@@ -556,6 +567,7 @@ include/octave-${PKGVERSION}/octave/sparse-base-chol.cc
 include/octave-${PKGVERSION}/octave/sparse-base-chol.h
 include/octave-${PKGVERSION}/octave/sparse-base-lu.cc
 include/octave-${PKGVERSION}/octave/sparse-base-lu.h
+include/octave-${PKGVERSION}/octave/sparse-dmsolve.cc
 include/octave-${PKGVERSION}/octave/sparse-sort.h
 include/octave-${PKGVERSION}/octave/sparse-util.h
 include/octave-${PKGVERSION}/octave/sparse-xdiv.h
@@ -598,165 +610,90 @@ info/octave.info
 lib/libcruft.la
 lib/liboctave.la
 lib/liboctinterp.la
-libexec/octave/${PKGVERSION}/exec/${GNU_PLATFORM_DIR}/info-emacs-info
-libexec/octave/${PKGVERSION}/exec/${GNU_PLATFORM_DIR}/info-emacs-octave-help
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/PKG_ADD
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/__glpk__.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/__qp__.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/balance.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/besselj.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/betainc.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/ccolamd.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/cellfun.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/chol.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/colamd.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/colloc.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/daspk.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/dasrt.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/dassl.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/det.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/dispatch.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/eig.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/expm.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/fft.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/fft2.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/fftn.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/fftw_wisdom.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/filter.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/find.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/fsolve.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/gammainc.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/gcd.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/getgrent.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/getpwent.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/getrusage.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/givens.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/gplot.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/hess.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/inv.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/kron.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/lpsolve.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/lsode.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/lu.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/luinc.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/matrix_type.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/minmax.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/pinv.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/qr.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/quad.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/qz.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/rand.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/schur.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/sort.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/sparse.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spchol.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spdet.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spkron.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/splu.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spparms.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/sqrtm.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/svd.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/syl.oct
-libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/time.oct
+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}/__contourc__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__delaunayn__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__dsearchn__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__glpk__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_raw__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__lin_interpn__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__pchip_deriv__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__qp__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__voronoi__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/balance.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/besselj.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/betainc.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/bsxfun.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/ccolamd.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}/colamd.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/colloc.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/conv2.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/convhulln.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/daspk.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dasrt.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dassl.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}/eig.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
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fftn.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fftw.oct
+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}/gammainc.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gcd.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/getgrent.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/getpwent.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}/hess.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/inv.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/kron.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/lpsolve.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/lsode.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/lu.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/luinc.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/matrix_type.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/md5sum.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/minmax.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/pinv.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}/qz.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/rand.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/regexp.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/schur.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}/spchol.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spdet.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spfind.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spkron.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/splu.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spparms.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spqr.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/sqrtm.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}/symrcm.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/time.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/tsearch.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/typecast.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/urlwrite.oct
 libexec/octave/ls-R
 man/man1/mkoctfile.1
 man/man1/octave-bug.1
 man/man1/octave-config.1
 man/man1/octave.1
-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_2.html
-share/doc/html/octave/Octave-FAQ_3.html
-share/doc/html/octave/Octave-FAQ_4.html
-share/doc/html/octave/Octave-FAQ_5.html
-share/doc/html/octave/Octave-FAQ_6.html
-share/doc/html/octave/Octave-FAQ_7.html
-share/doc/html/octave/Octave-FAQ_8.html
-share/doc/html/octave/Octave-FAQ_9.html
-share/doc/html/octave/Octave-FAQ_foot.html
-share/doc/html/octave/Octave-FAQ_toc.html
-share/doc/html/octave/liboctave_1.html
-share/doc/html/octave/liboctave_10.html
-share/doc/html/octave/liboctave_11.html
-share/doc/html/octave/liboctave_12.html
-share/doc/html/octave/liboctave_13.html
-share/doc/html/octave/liboctave_14.html
-share/doc/html/octave/liboctave_15.html
-share/doc/html/octave/liboctave_16.html
-share/doc/html/octave/liboctave_17.html
-share/doc/html/octave/liboctave_18.html
-share/doc/html/octave/liboctave_2.html
-share/doc/html/octave/liboctave_3.html
-share/doc/html/octave/liboctave_4.html
-share/doc/html/octave/liboctave_5.html
-share/doc/html/octave/liboctave_6.html
-share/doc/html/octave/liboctave_7.html
-share/doc/html/octave/liboctave_8.html
-share/doc/html/octave/liboctave_9.html
-share/doc/html/octave/liboctave_toc.html
-share/doc/html/octave/octave_1.html
-share/doc/html/octave/octave_10.html
-share/doc/html/octave/octave_11.html
-share/doc/html/octave/octave_12.html
-share/doc/html/octave/octave_13.html
-share/doc/html/octave/octave_14.html
-share/doc/html/octave/octave_15.html
-share/doc/html/octave/octave_16.html
-share/doc/html/octave/octave_17.html
-share/doc/html/octave/octave_18.html
-share/doc/html/octave/octave_19.html
-share/doc/html/octave/octave_2.html
-share/doc/html/octave/octave_20.html
-share/doc/html/octave/octave_21.html
-share/doc/html/octave/octave_22.html
-share/doc/html/octave/octave_23.html
-share/doc/html/octave/octave_24.html
-share/doc/html/octave/octave_25.html
-share/doc/html/octave/octave_26.html
-share/doc/html/octave/octave_27.html
-share/doc/html/octave/octave_28.html
-share/doc/html/octave/octave_29.html
-share/doc/html/octave/octave_3.html
-share/doc/html/octave/octave_30.html
-share/doc/html/octave/octave_31.html
-share/doc/html/octave/octave_32.html
-share/doc/html/octave/octave_33.html
-share/doc/html/octave/octave_34.html
-share/doc/html/octave/octave_35.html
-share/doc/html/octave/octave_36.html
-share/doc/html/octave/octave_37.html
-share/doc/html/octave/octave_38.html
-share/doc/html/octave/octave_39.html
-share/doc/html/octave/octave_4.html
-share/doc/html/octave/octave_40.html
-share/doc/html/octave/octave_41.html
-share/doc/html/octave/octave_42.html
-share/doc/html/octave/octave_43.html
-share/doc/html/octave/octave_44.html
-share/doc/html/octave/octave_45.html
-share/doc/html/octave/octave_46.html
-share/doc/html/octave/octave_47.html
-share/doc/html/octave/octave_48.html
-share/doc/html/octave/octave_49.html
-share/doc/html/octave/octave_5.html
-share/doc/html/octave/octave_50.html
-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
-share/doc/html/octave/octave_9.html
-share/doc/html/octave/octave_abt.html
-share/doc/html/octave/octave_foot.html
-share/doc/html/octave/octave_fot.html
-share/doc/html/octave/octave_ovr.html
-share/doc/html/octave/octave_toc.html
+share/applications/www.octave.org-octave.desktop
+share/octave/${PKGVERSION}/NEWS
 share/octave/${PKGVERSION}/doc/Octave-FAQ.ps
 share/octave/${PKGVERSION}/doc/liboctave.ps
 share/octave/${PKGVERSION}/doc/octave.ps
@@ -764,6 +701,7 @@ share/octave/${PKGVERSION}/doc/refcard-a4.ps
 share/octave/${PKGVERSION}/doc/refcard-legal.ps
 share/octave/${PKGVERSION}/doc/refcard-letter.ps
 share/octave/${PKGVERSION}/imagelib/default.img
+share/octave/${PKGVERSION}/imagelib/octave-sombrero.png
 share/octave/${PKGVERSION}/m/audio/lin2mu.m
 share/octave/${PKGVERSION}/m/audio/loadaudio.m
 share/octave/${PKGVERSION}/m/audio/mu2lin.m
@@ -771,6 +709,8 @@ share/octave/${PKGVERSION}/m/audio/playaudio.m
 share/octave/${PKGVERSION}/m/audio/record.m
 share/octave/${PKGVERSION}/m/audio/saveaudio.m
 share/octave/${PKGVERSION}/m/audio/setaudio.m
+share/octave/${PKGVERSION}/m/audio/wavread.m
+share/octave/${PKGVERSION}/m/audio/wavwrite.m
 share/octave/${PKGVERSION}/m/control/base/DEMOcontrol.m
 share/octave/${PKGVERSION}/m/control/base/__bodquist__.m
 share/octave/${PKGVERSION}/m/control/base/__freqresp__.m
@@ -938,6 +878,8 @@ share/octave/${PKGVERSION}/m/deprecated/chisquare_cdf.m
 share/octave/${PKGVERSION}/m/deprecated/chisquare_inv.m
 share/octave/${PKGVERSION}/m/deprecated/chisquare_pdf.m
 share/octave/${PKGVERSION}/m/deprecated/chisquare_rnd.m
+share/octave/${PKGVERSION}/m/deprecated/clearplot.m
+share/octave/${PKGVERSION}/m/deprecated/clg.m
 share/octave/${PKGVERSION}/m/deprecated/com2str.m
 share/octave/${PKGVERSION}/m/deprecated/exponential_cdf.m
 share/octave/${PKGVERSION}/m/deprecated/exponential_inv.m
@@ -959,9 +901,9 @@ share/octave/${PKGVERSION}/m/deprecated/hypergeometric_cdf.m
 share/octave/${PKGVERSION}/m/deprecated/hypergeometric_inv.m
 share/octave/${PKGVERSION}/m/deprecated/hypergeometric_pdf.m
 share/octave/${PKGVERSION}/m/deprecated/hypergeometric_rnd.m
+share/octave/${PKGVERSION}/m/deprecated/intersection.m
 share/octave/${PKGVERSION}/m/deprecated/is_bool.m
 share/octave/${PKGVERSION}/m/deprecated/is_complex.m
-share/octave/${PKGVERSION}/m/deprecated/is_global.m
 share/octave/${PKGVERSION}/m/deprecated/is_list.m
 share/octave/${PKGVERSION}/m/deprecated/is_matrix.m
 share/octave/${PKGVERSION}/m/deprecated/is_scalar.m
@@ -975,14 +917,20 @@ share/octave/${PKGVERSION}/m/deprecated/lognormal_cdf.m
 share/octave/${PKGVERSION}/m/deprecated/lognormal_inv.m
 share/octave/${PKGVERSION}/m/deprecated/lognormal_pdf.m
 share/octave/${PKGVERSION}/m/deprecated/lognormal_rnd.m
+share/octave/${PKGVERSION}/m/deprecated/meshdom.m
 share/octave/${PKGVERSION}/m/deprecated/normal_cdf.m
 share/octave/${PKGVERSION}/m/deprecated/normal_inv.m
 share/octave/${PKGVERSION}/m/deprecated/normal_pdf.m
 share/octave/${PKGVERSION}/m/deprecated/normal_rnd.m
+share/octave/${PKGVERSION}/m/deprecated/pascal_cdf.m
+share/octave/${PKGVERSION}/m/deprecated/pascal_inv.m
+share/octave/${PKGVERSION}/m/deprecated/pascal_pdf.m
+share/octave/${PKGVERSION}/m/deprecated/pascal_rnd.m
 share/octave/${PKGVERSION}/m/deprecated/poisson_cdf.m
 share/octave/${PKGVERSION}/m/deprecated/poisson_inv.m
 share/octave/${PKGVERSION}/m/deprecated/poisson_pdf.m
 share/octave/${PKGVERSION}/m/deprecated/poisson_rnd.m
+share/octave/${PKGVERSION}/m/deprecated/polyinteg.m
 share/octave/${PKGVERSION}/m/deprecated/setstr.m
 share/octave/${PKGVERSION}/m/deprecated/struct_contains.m
 share/octave/${PKGVERSION}/m/deprecated/struct_elements.m
@@ -994,24 +942,40 @@ share/octave/${PKGVERSION}/m/deprecated/uniform_cdf.m
 share/octave/${PKGVERSION}/m/deprecated/uniform_inv.m
 share/octave/${PKGVERSION}/m/deprecated/uniform_pdf.m
 share/octave/${PKGVERSION}/m/deprecated/uniform_rnd.m
+share/octave/${PKGVERSION}/m/deprecated/weibcdf.m
+share/octave/${PKGVERSION}/m/deprecated/weibinv.m
+share/octave/${PKGVERSION}/m/deprecated/weibpdf.m
+share/octave/${PKGVERSION}/m/deprecated/weibrnd.m
 share/octave/${PKGVERSION}/m/deprecated/weibull_cdf.m
 share/octave/${PKGVERSION}/m/deprecated/weibull_inv.m
 share/octave/${PKGVERSION}/m/deprecated/weibull_pdf.m
 share/octave/${PKGVERSION}/m/deprecated/weibull_rnd.m
 share/octave/${PKGVERSION}/m/deprecated/wiener_rnd.m
+share/octave/${PKGVERSION}/m/elfun/acosd.m
 share/octave/${PKGVERSION}/m/elfun/acot.m
+share/octave/${PKGVERSION}/m/elfun/acotd.m
 share/octave/${PKGVERSION}/m/elfun/acoth.m
 share/octave/${PKGVERSION}/m/elfun/acsc.m
+share/octave/${PKGVERSION}/m/elfun/acscd.m
 share/octave/${PKGVERSION}/m/elfun/acsch.m
 share/octave/${PKGVERSION}/m/elfun/asec.m
+share/octave/${PKGVERSION}/m/elfun/asecd.m
 share/octave/${PKGVERSION}/m/elfun/asech.m
+share/octave/${PKGVERSION}/m/elfun/asind.m
+share/octave/${PKGVERSION}/m/elfun/atand.m
+share/octave/${PKGVERSION}/m/elfun/cosd.m
 share/octave/${PKGVERSION}/m/elfun/cot.m
+share/octave/${PKGVERSION}/m/elfun/cotd.m
 share/octave/${PKGVERSION}/m/elfun/coth.m
 share/octave/${PKGVERSION}/m/elfun/csc.m
+share/octave/${PKGVERSION}/m/elfun/cscd.m
 share/octave/${PKGVERSION}/m/elfun/csch.m
 share/octave/${PKGVERSION}/m/elfun/lcm.m
 share/octave/${PKGVERSION}/m/elfun/sec.m
+share/octave/${PKGVERSION}/m/elfun/secd.m
 share/octave/${PKGVERSION}/m/elfun/sech.m
+share/octave/${PKGVERSION}/m/elfun/sind.m
+share/octave/${PKGVERSION}/m/elfun/tand.m
 share/octave/${PKGVERSION}/m/finance/fv.m
 share/octave/${PKGVERSION}/m/finance/fvl.m
 share/octave/${PKGVERSION}/m/finance/irr.m
@@ -1022,69 +986,128 @@ share/octave/${PKGVERSION}/m/finance/pv.m
 share/octave/${PKGVERSION}/m/finance/pvl.m
 share/octave/${PKGVERSION}/m/finance/rate.m
 share/octave/${PKGVERSION}/m/finance/vol.m
+share/octave/${PKGVERSION}/m/general/__isequal__.m
+share/octave/${PKGVERSION}/m/general/__splinen__.m
+share/octave/${PKGVERSION}/m/general/accumarray.m
+share/octave/${PKGVERSION}/m/general/arrayfun.m
+share/octave/${PKGVERSION}/m/general/bicubic.m
 share/octave/${PKGVERSION}/m/general/bitcmp.m
 share/octave/${PKGVERSION}/m/general/bitget.m
 share/octave/${PKGVERSION}/m/general/bitset.m
+share/octave/${PKGVERSION}/m/general/blkdiag.m
 share/octave/${PKGVERSION}/m/general/cart2pol.m
 share/octave/${PKGVERSION}/m/general/cart2sph.m
+share/octave/${PKGVERSION}/m/general/cell2mat.m
+share/octave/${PKGVERSION}/m/general/celldisp.m
 share/octave/${PKGVERSION}/m/general/circshift.m
-share/octave/${PKGVERSION}/m/general/columns.m
 share/octave/${PKGVERSION}/m/general/common_size.m
+share/octave/${PKGVERSION}/m/general/cplxpair.m
+share/octave/${PKGVERSION}/m/general/cumtrapz.m
 share/octave/${PKGVERSION}/m/general/deal.m
+share/octave/${PKGVERSION}/m/general/del2.m
 share/octave/${PKGVERSION}/m/general/diff.m
 share/octave/${PKGVERSION}/m/general/flipdim.m
 share/octave/${PKGVERSION}/m/general/fliplr.m
 share/octave/${PKGVERSION}/m/general/flipud.m
+share/octave/${PKGVERSION}/m/general/gradient.m
 share/octave/${PKGVERSION}/m/general/ind2sub.m
 share/octave/${PKGVERSION}/m/general/int2str.m
+share/octave/${PKGVERSION}/m/general/interp1.m
+share/octave/${PKGVERSION}/m/general/interp2.m
+share/octave/${PKGVERSION}/m/general/interp3.m
+share/octave/${PKGVERSION}/m/general/interpft.m
+share/octave/${PKGVERSION}/m/general/interpn.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/isdir.m
 share/octave/${PKGVERSION}/m/general/isequal.m
+share/octave/${PKGVERSION}/m/general/isequalwithequalnans.m
 share/octave/${PKGVERSION}/m/general/isscalar.m
 share/octave/${PKGVERSION}/m/general/issquare.m
 share/octave/${PKGVERSION}/m/general/issymmetric.m
 share/octave/${PKGVERSION}/m/general/isvector.m
 share/octave/${PKGVERSION}/m/general/logical.m
 share/octave/${PKGVERSION}/m/general/logspace.m
+share/octave/${PKGVERSION}/m/general/lookup.m
 share/octave/${PKGVERSION}/m/general/mod.m
 share/octave/${PKGVERSION}/m/general/nargchk.m
 share/octave/${PKGVERSION}/m/general/nextpow2.m
+share/octave/${PKGVERSION}/m/general/nthroot.m
 share/octave/${PKGVERSION}/m/general/num2str.m
 share/octave/${PKGVERSION}/m/general/perror.m
 share/octave/${PKGVERSION}/m/general/pol2cart.m
+share/octave/${PKGVERSION}/m/general/polyarea.m
 share/octave/${PKGVERSION}/m/general/postpad.m
 share/octave/${PKGVERSION}/m/general/prepad.m
+share/octave/${PKGVERSION}/m/general/quadl.m
 share/octave/${PKGVERSION}/m/general/randperm.m
+share/octave/${PKGVERSION}/m/general/rat.m
 share/octave/${PKGVERSION}/m/general/rem.m
 share/octave/${PKGVERSION}/m/general/repmat.m
 share/octave/${PKGVERSION}/m/general/rot90.m
 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/structfun.m
 share/octave/${PKGVERSION}/m/general/sub2ind.m
+share/octave/${PKGVERSION}/m/general/trapz.m
 share/octave/${PKGVERSION}/m/general/tril.m
 share/octave/${PKGVERSION}/m/general/triu.m
+share/octave/${PKGVERSION}/m/geometry/convhull.m
+share/octave/${PKGVERSION}/m/geometry/delaunay.m
+share/octave/${PKGVERSION}/m/geometry/delaunay3.m
+share/octave/${PKGVERSION}/m/geometry/delaunayn.m
+share/octave/${PKGVERSION}/m/geometry/dsearch.m
+share/octave/${PKGVERSION}/m/geometry/dsearchn.m
+share/octave/${PKGVERSION}/m/geometry/griddata.m
+share/octave/${PKGVERSION}/m/geometry/griddata3.m
+share/octave/${PKGVERSION}/m/geometry/griddatan.m
+share/octave/${PKGVERSION}/m/geometry/inpolygon.m
+share/octave/${PKGVERSION}/m/geometry/trimesh.m
+share/octave/${PKGVERSION}/m/geometry/triplot.m
+share/octave/${PKGVERSION}/m/geometry/tsearchn.m
+share/octave/${PKGVERSION}/m/geometry/voronoi.m
+share/octave/${PKGVERSION}/m/geometry/voronoin.m
+share/octave/${PKGVERSION}/m/image/PKG_ADD
+share/octave/${PKGVERSION}/m/image/__img__.m
+share/octave/${PKGVERSION}/m/image/__img_via_file__.m
+share/octave/${PKGVERSION}/m/image/autumn.m
+share/octave/${PKGVERSION}/m/image/bone.m
+share/octave/${PKGVERSION}/m/image/brighten.m
 share/octave/${PKGVERSION}/m/image/colormap.m
+share/octave/${PKGVERSION}/m/image/cool.m
+share/octave/${PKGVERSION}/m/image/copper.m
+share/octave/${PKGVERSION}/m/image/flag.m
 share/octave/${PKGVERSION}/m/image/gray.m
 share/octave/${PKGVERSION}/m/image/gray2ind.m
+share/octave/${PKGVERSION}/m/image/hot.m
+share/octave/${PKGVERSION}/m/image/hsv.m
 share/octave/${PKGVERSION}/m/image/hsv2rgb.m
 share/octave/${PKGVERSION}/m/image/image.m
+share/octave/${PKGVERSION}/m/image/image_viewer.m
 share/octave/${PKGVERSION}/m/image/imagesc.m
 share/octave/${PKGVERSION}/m/image/imshow.m
 share/octave/${PKGVERSION}/m/image/ind2gray.m
 share/octave/${PKGVERSION}/m/image/ind2rgb.m
+share/octave/${PKGVERSION}/m/image/jet.m
 share/octave/${PKGVERSION}/m/image/loadimage.m
 share/octave/${PKGVERSION}/m/image/ntsc2rgb.m
 share/octave/${PKGVERSION}/m/image/ocean.m
+share/octave/${PKGVERSION}/m/image/pink.m
+share/octave/${PKGVERSION}/m/image/prism.m
+share/octave/${PKGVERSION}/m/image/rainbow.m
 share/octave/${PKGVERSION}/m/image/rgb2hsv.m
 share/octave/${PKGVERSION}/m/image/rgb2ind.m
 share/octave/${PKGVERSION}/m/image/rgb2ntsc.m
 share/octave/${PKGVERSION}/m/image/saveimage.m
+share/octave/${PKGVERSION}/m/image/spring.m
+share/octave/${PKGVERSION}/m/image/summer.m
+share/octave/${PKGVERSION}/m/image/white.m
+share/octave/${PKGVERSION}/m/image/winter.m
 share/octave/${PKGVERSION}/m/io/beep.m
 share/octave/${PKGVERSION}/m/linear-algebra/commutation_matrix.m
 share/octave/${PKGVERSION}/m/linear-algebra/cond.m
@@ -1101,54 +1124,93 @@ share/octave/${PKGVERSION}/m/linear-algebra/null.m
 share/octave/${PKGVERSION}/m/linear-algebra/orth.m
 share/octave/${PKGVERSION}/m/linear-algebra/qzhess.m
 share/octave/${PKGVERSION}/m/linear-algebra/rank.m
+share/octave/${PKGVERSION}/m/linear-algebra/rref.m
 share/octave/${PKGVERSION}/m/linear-algebra/trace.m
 share/octave/${PKGVERSION}/m/linear-algebra/vec.m
 share/octave/${PKGVERSION}/m/linear-algebra/vech.m
 share/octave/${PKGVERSION}/m/miscellaneous/PKG_ADD
+share/octave/${PKGVERSION}/m/miscellaneous/ans.m
 share/octave/${PKGVERSION}/m/miscellaneous/bincoeff.m
 share/octave/${PKGVERSION}/m/miscellaneous/bug_report.m
+share/octave/${PKGVERSION}/m/miscellaneous/bunzip2.m
+share/octave/${PKGVERSION}/m/miscellaneous/cast.m
 share/octave/${PKGVERSION}/m/miscellaneous/comma.m
+share/octave/${PKGVERSION}/m/miscellaneous/compare_versions.m
 share/octave/${PKGVERSION}/m/miscellaneous/computer.m
+share/octave/${PKGVERSION}/m/miscellaneous/copyfile.m
 share/octave/${PKGVERSION}/m/miscellaneous/cputime.m
 share/octave/${PKGVERSION}/m/miscellaneous/delete.m
 share/octave/${PKGVERSION}/m/miscellaneous/dir.m
+share/octave/${PKGVERSION}/m/miscellaneous/doc.m
+share/octave/${PKGVERSION}/m/miscellaneous/dos.m
 share/octave/${PKGVERSION}/m/miscellaneous/dump_prefs.m
-share/octave/${PKGVERSION}/m/miscellaneous/etime.m
+share/octave/${PKGVERSION}/m/miscellaneous/fileattrib.m
 share/octave/${PKGVERSION}/m/miscellaneous/fileparts.m
 share/octave/${PKGVERSION}/m/miscellaneous/flops.m
 share/octave/${PKGVERSION}/m/miscellaneous/fullfile.m
-share/octave/${PKGVERSION}/m/miscellaneous/is_leap_year.m
+share/octave/${PKGVERSION}/m/miscellaneous/getfield.m
+share/octave/${PKGVERSION}/m/miscellaneous/gunzip.m
+share/octave/${PKGVERSION}/m/miscellaneous/gzip.m
+share/octave/${PKGVERSION}/m/miscellaneous/inputname.m
 share/octave/${PKGVERSION}/m/miscellaneous/ispc.m
 share/octave/${PKGVERSION}/m/miscellaneous/isunix.m
+share/octave/${PKGVERSION}/m/miscellaneous/license.m
 share/octave/${PKGVERSION}/m/miscellaneous/list_primes.m
+share/octave/${PKGVERSION}/m/miscellaneous/ls.m
+share/octave/${PKGVERSION}/m/miscellaneous/ls_command.m
 share/octave/${PKGVERSION}/m/miscellaneous/menu.m
-share/octave/${PKGVERSION}/m/miscellaneous/not.m
+share/octave/${PKGVERSION}/m/miscellaneous/mex.m
+share/octave/${PKGVERSION}/m/miscellaneous/mexext.m
+share/octave/${PKGVERSION}/m/miscellaneous/mkoctfile.m
+share/octave/${PKGVERSION}/m/miscellaneous/movefile.m
+share/octave/${PKGVERSION}/m/miscellaneous/news.m
+share/octave/${PKGVERSION}/m/miscellaneous/orderfields.m
 share/octave/${PKGVERSION}/m/miscellaneous/pack.m
 share/octave/${PKGVERSION}/m/miscellaneous/paren.m
-share/octave/${PKGVERSION}/m/miscellaneous/path.m
-share/octave/${PKGVERSION}/m/miscellaneous/popen2.m
+share/octave/${PKGVERSION}/m/miscellaneous/parseparams.m
+share/octave/${PKGVERSION}/m/miscellaneous/run.m
 share/octave/${PKGVERSION}/m/miscellaneous/semicolon.m
+share/octave/${PKGVERSION}/m/miscellaneous/setfield.m
 share/octave/${PKGVERSION}/m/miscellaneous/single.m
+share/octave/${PKGVERSION}/m/miscellaneous/substruct.m
+share/octave/${PKGVERSION}/m/miscellaneous/swapbytes.m
+share/octave/${PKGVERSION}/m/miscellaneous/tar.m
 share/octave/${PKGVERSION}/m/miscellaneous/tempdir.m
 share/octave/${PKGVERSION}/m/miscellaneous/tempname.m
 share/octave/${PKGVERSION}/m/miscellaneous/texas_lotto.m
-share/octave/${PKGVERSION}/m/miscellaneous/tic.m
-share/octave/${PKGVERSION}/m/miscellaneous/toc.m
 share/octave/${PKGVERSION}/m/miscellaneous/unix.m
+share/octave/${PKGVERSION}/m/miscellaneous/unpack.m
+share/octave/${PKGVERSION}/m/miscellaneous/untar.m
+share/octave/${PKGVERSION}/m/miscellaneous/unzip.m
+share/octave/${PKGVERSION}/m/miscellaneous/ver.m
 share/octave/${PKGVERSION}/m/miscellaneous/version.m
+share/octave/${PKGVERSION}/m/miscellaneous/warning_ids.m
 share/octave/${PKGVERSION}/m/miscellaneous/xor.m
+share/octave/${PKGVERSION}/m/miscellaneous/zip.m
+share/octave/${PKGVERSION}/m/optimization/__fsolve_defopts__.m
 share/octave/${PKGVERSION}/m/optimization/glpk.m
 share/octave/${PKGVERSION}/m/optimization/glpkmex.m
+share/octave/${PKGVERSION}/m/optimization/optimset.m
 share/octave/${PKGVERSION}/m/optimization/qp.m
 share/octave/${PKGVERSION}/m/optimization/sqp.m
+share/octave/${PKGVERSION}/m/path/savepath.m
+share/octave/${PKGVERSION}/m/pkg/PKG_ADD
+share/octave/${PKGVERSION}/m/pkg/pkg.m
 share/octave/${PKGVERSION}/m/plot/PKG_ADD
 share/octave/${PKGVERSION}/m/plot/__axis_label__.m
+share/octave/${PKGVERSION}/m/plot/__bar__.m
+share/octave/${PKGVERSION}/m/plot/__default_plot_options__.m
 share/octave/${PKGVERSION}/m/plot/__errcomm__.m
 share/octave/${PKGVERSION}/m/plot/__errplot__.m
-share/octave/${PKGVERSION}/m/plot/__plot_globals__.m
+share/octave/${PKGVERSION}/m/plot/__gnuplot_version__.m
+share/octave/${PKGVERSION}/m/plot/__go_close_all__.m
+share/octave/${PKGVERSION}/m/plot/__go_draw_axes__.m
+share/octave/${PKGVERSION}/m/plot/__go_draw_figure__.m
+share/octave/${PKGVERSION}/m/plot/__line__.m
+share/octave/${PKGVERSION}/m/plot/__next_line_color__.m
+share/octave/${PKGVERSION}/m/plot/__patch__.m
 share/octave/${PKGVERSION}/m/plot/__plr1__.m
 share/octave/${PKGVERSION}/m/plot/__plr2__.m
-share/octave/${PKGVERSION}/m/plot/__plr__.m
 share/octave/${PKGVERSION}/m/plot/__plt1__.m
 share/octave/${PKGVERSION}/m/plot/__plt2__.m
 share/octave/${PKGVERSION}/m/plot/__plt2mm__.m
@@ -1157,32 +1219,45 @@ share/octave/${PKGVERSION}/m/plot/__plt2ss__.m
 share/octave/${PKGVERSION}/m/plot/__plt2vm__.m
 share/octave/${PKGVERSION}/m/plot/__plt2vv__.m
 share/octave/${PKGVERSION}/m/plot/__plt__.m
+share/octave/${PKGVERSION}/m/plot/__plt_get_axis_arg__.m
 share/octave/${PKGVERSION}/m/plot/__pltopt1__.m
 share/octave/${PKGVERSION}/m/plot/__pltopt__.m
-share/octave/${PKGVERSION}/m/plot/__setup_plot__.m
+share/octave/${PKGVERSION}/m/plot/ancestor.m
+share/octave/${PKGVERSION}/m/plot/axes.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/barh.m
+share/octave/${PKGVERSION}/m/plot/box.m
+share/octave/${PKGVERSION}/m/plot/clf.m
 share/octave/${PKGVERSION}/m/plot/close.m
+share/octave/${PKGVERSION}/m/plot/closereq.m
 share/octave/${PKGVERSION}/m/plot/contour.m
+share/octave/${PKGVERSION}/m/plot/contourc.m
+share/octave/${PKGVERSION}/m/plot/drawnow.m
 share/octave/${PKGVERSION}/m/plot/errorbar.m
 share/octave/${PKGVERSION}/m/plot/figure.m
+share/octave/${PKGVERSION}/m/plot/fplot.m
+share/octave/${PKGVERSION}/m/plot/gca.m
+share/octave/${PKGVERSION}/m/plot/gcf.m
 share/octave/${PKGVERSION}/m/plot/grid.m
 share/octave/${PKGVERSION}/m/plot/hist.m
 share/octave/${PKGVERSION}/m/plot/hold.m
+share/octave/${PKGVERSION}/m/plot/isfigure.m
 share/octave/${PKGVERSION}/m/plot/ishold.m
+share/octave/${PKGVERSION}/m/plot/legend.m
+share/octave/${PKGVERSION}/m/plot/line.m
 share/octave/${PKGVERSION}/m/plot/loglog.m
 share/octave/${PKGVERSION}/m/plot/loglogerr.m
 share/octave/${PKGVERSION}/m/plot/mesh.m
-share/octave/${PKGVERSION}/m/plot/meshdom.m
+share/octave/${PKGVERSION}/m/plot/meshc.m
 share/octave/${PKGVERSION}/m/plot/meshgrid.m
-share/octave/${PKGVERSION}/m/plot/mplot.m
-share/octave/${PKGVERSION}/m/plot/multiplot.m
-share/octave/${PKGVERSION}/m/plot/oneplot.m
+share/octave/${PKGVERSION}/m/plot/ndgrid.m
+share/octave/${PKGVERSION}/m/plot/newplot.m
 share/octave/${PKGVERSION}/m/plot/orient.m
+share/octave/${PKGVERSION}/m/plot/patch.m
+share/octave/${PKGVERSION}/m/plot/peaks.m
 share/octave/${PKGVERSION}/m/plot/plot.m
-share/octave/${PKGVERSION}/m/plot/plot_border.m
+share/octave/${PKGVERSION}/m/plot/plot3.m
 share/octave/${PKGVERSION}/m/plot/polar.m
 share/octave/${PKGVERSION}/m/plot/print.m
 share/octave/${PKGVERSION}/m/plot/replot.m
@@ -1193,28 +1268,34 @@ share/octave/${PKGVERSION}/m/plot/semilogyerr.m
 share/octave/${PKGVERSION}/m/plot/shg.m
 share/octave/${PKGVERSION}/m/plot/sombrero.m
 share/octave/${PKGVERSION}/m/plot/stairs.m
+share/octave/${PKGVERSION}/m/plot/stem.m
 share/octave/${PKGVERSION}/m/plot/subplot.m
-share/octave/${PKGVERSION}/m/plot/subwindow.m
+share/octave/${PKGVERSION}/m/plot/text.m
 share/octave/${PKGVERSION}/m/plot/title.m
-share/octave/${PKGVERSION}/m/plot/top_title.m
+share/octave/${PKGVERSION}/m/plot/view.m
 share/octave/${PKGVERSION}/m/plot/xlabel.m
 share/octave/${PKGVERSION}/m/plot/ylabel.m
 share/octave/${PKGVERSION}/m/plot/zlabel.m
 share/octave/${PKGVERSION}/m/polynomial/compan.m
 share/octave/${PKGVERSION}/m/polynomial/conv.m
 share/octave/${PKGVERSION}/m/polynomial/deconv.m
+share/octave/${PKGVERSION}/m/polynomial/mkpp.m
+share/octave/${PKGVERSION}/m/polynomial/pchip.m
 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/polyint.m
 share/octave/${PKGVERSION}/m/polynomial/polyout.m
 share/octave/${PKGVERSION}/m/polynomial/polyreduce.m
 share/octave/${PKGVERSION}/m/polynomial/polyval.m
 share/octave/${PKGVERSION}/m/polynomial/polyvalm.m
+share/octave/${PKGVERSION}/m/polynomial/ppval.m
 share/octave/${PKGVERSION}/m/polynomial/residue.m
 share/octave/${PKGVERSION}/m/polynomial/roots.m
+share/octave/${PKGVERSION}/m/polynomial/spline.m
+share/octave/${PKGVERSION}/m/polynomial/unmkpp.m
 share/octave/${PKGVERSION}/m/quaternion/demoquat.m
 share/octave/${PKGVERSION}/m/quaternion/qconj.m
 share/octave/${PKGVERSION}/m/quaternion/qcoordinate_plot.m
@@ -1228,9 +1309,10 @@ share/octave/${PKGVERSION}/m/quaternion/qtransvmat.m
 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/intersect.m
 share/octave/${PKGVERSION}/m/set/ismember.m
 share/octave/${PKGVERSION}/m/set/setdiff.m
+share/octave/${PKGVERSION}/m/set/setxor.m
 share/octave/${PKGVERSION}/m/set/union.m
 share/octave/${PKGVERSION}/m/set/unique.m
 share/octave/${PKGVERSION}/m/signal/arch_fit.m
@@ -1248,12 +1330,14 @@ share/octave/${PKGVERSION}/m/signal/durbinlevinson.m
 share/octave/${PKGVERSION}/m/signal/fftconv.m
 share/octave/${PKGVERSION}/m/signal/fftfilt.m
 share/octave/${PKGVERSION}/m/signal/fftshift.m
+share/octave/${PKGVERSION}/m/signal/filter2.m
 share/octave/${PKGVERSION}/m/signal/fractdiff.m
 share/octave/${PKGVERSION}/m/signal/freqz.m
 share/octave/${PKGVERSION}/m/signal/freqz_plot.m
 share/octave/${PKGVERSION}/m/signal/hamming.m
 share/octave/${PKGVERSION}/m/signal/hanning.m
 share/octave/${PKGVERSION}/m/signal/hurst.m
+share/octave/${PKGVERSION}/m/signal/ifftshift.m
 share/octave/${PKGVERSION}/m/signal/periodogram.m
 share/octave/${PKGVERSION}/m/signal/rectangle_lw.m
 share/octave/${PKGVERSION}/m/signal/rectangle_sw.m
@@ -1270,7 +1354,12 @@ 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/etreeplot.m
+share/octave/${PKGVERSION}/m/sparse/gplot.m
 share/octave/${PKGVERSION}/m/sparse/nonzeros.m
+share/octave/${PKGVERSION}/m/sparse/normest.m
+share/octave/${PKGVERSION}/m/sparse/pcg.m
+share/octave/${PKGVERSION}/m/sparse/pcr.m
 share/octave/${PKGVERSION}/m/sparse/spalloc.m
 share/octave/${PKGVERSION}/m/sparse/spconvert.m
 share/octave/${PKGVERSION}/m/sparse/spdiags.m
@@ -1280,22 +1369,37 @@ 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/sprandsym.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/sparse/treeplot.m
 share/octave/${PKGVERSION}/m/specfun/bessel.m
 share/octave/${PKGVERSION}/m/specfun/beta.m
 share/octave/${PKGVERSION}/m/specfun/betai.m
+share/octave/${PKGVERSION}/m/specfun/betaln.m
 share/octave/${PKGVERSION}/m/specfun/erfinv.m
+share/octave/${PKGVERSION}/m/specfun/factor.m
+share/octave/${PKGVERSION}/m/specfun/factorial.m
 share/octave/${PKGVERSION}/m/specfun/gammai.m
+share/octave/${PKGVERSION}/m/specfun/isprime.m
+share/octave/${PKGVERSION}/m/specfun/legendre.m
 share/octave/${PKGVERSION}/m/specfun/log2.m
+share/octave/${PKGVERSION}/m/specfun/nchoosek.m
+share/octave/${PKGVERSION}/m/specfun/perms.m
 share/octave/${PKGVERSION}/m/specfun/pow2.m
+share/octave/${PKGVERSION}/m/specfun/primes.m
+share/octave/${PKGVERSION}/m/special-matrix/hadamard.m
 share/octave/${PKGVERSION}/m/special-matrix/hankel.m
 share/octave/${PKGVERSION}/m/special-matrix/hilb.m
 share/octave/${PKGVERSION}/m/special-matrix/invhilb.m
+share/octave/${PKGVERSION}/m/special-matrix/magic.m
+share/octave/${PKGVERSION}/m/special-matrix/pascal.m
+share/octave/${PKGVERSION}/m/special-matrix/rosser.m
 share/octave/${PKGVERSION}/m/special-matrix/sylvester_matrix.m
 share/octave/${PKGVERSION}/m/special-matrix/toeplitz.m
 share/octave/${PKGVERSION}/m/special-matrix/vander.m
+share/octave/${PKGVERSION}/m/special-matrix/wilkinson.m
 share/octave/${PKGVERSION}/m/startup/inputrc
 share/octave/${PKGVERSION}/m/startup/octaverc
 share/octave/${PKGVERSION}/m/statistics/base/center.m
@@ -1313,6 +1417,7 @@ share/octave/${PKGVERSION}/m/statistics/base/mahalanobis.m
 share/octave/${PKGVERSION}/m/statistics/base/mean.m
 share/octave/${PKGVERSION}/m/statistics/base/meansq.m
 share/octave/${PKGVERSION}/m/statistics/base/median.m
+share/octave/${PKGVERSION}/m/statistics/base/mode.m
 share/octave/${PKGVERSION}/m/statistics/base/moment.m
 share/octave/${PKGVERSION}/m/statistics/base/ols.m
 share/octave/${PKGVERSION}/m/statistics/base/ppplot.m
@@ -1326,7 +1431,6 @@ share/octave/${PKGVERSION}/m/statistics/base/spearman.m
 share/octave/${PKGVERSION}/m/statistics/base/statistics.m
 share/octave/${PKGVERSION}/m/statistics/base/std.m
 share/octave/${PKGVERSION}/m/statistics/base/studentize.m
-share/octave/${PKGVERSION}/m/statistics/base/unidrnd.m
 share/octave/${PKGVERSION}/m/statistics/base/table.m
 share/octave/${PKGVERSION}/m/statistics/base/values.m
 share/octave/${PKGVERSION}/m/statistics/base/var.m
@@ -1387,14 +1491,14 @@ share/octave/${PKGVERSION}/m/statistics/distributions/logncdf.m
 share/octave/${PKGVERSION}/m/statistics/distributions/logninv.m
 share/octave/${PKGVERSION}/m/statistics/distributions/lognpdf.m
 share/octave/${PKGVERSION}/m/statistics/distributions/lognrnd.m
+share/octave/${PKGVERSION}/m/statistics/distributions/nbincdf.m
+share/octave/${PKGVERSION}/m/statistics/distributions/nbininv.m
+share/octave/${PKGVERSION}/m/statistics/distributions/nbinpdf.m
+share/octave/${PKGVERSION}/m/statistics/distributions/nbinrnd.m
 share/octave/${PKGVERSION}/m/statistics/distributions/normcdf.m
 share/octave/${PKGVERSION}/m/statistics/distributions/norminv.m
 share/octave/${PKGVERSION}/m/statistics/distributions/normpdf.m
 share/octave/${PKGVERSION}/m/statistics/distributions/normrnd.m
-share/octave/${PKGVERSION}/m/statistics/distributions/pascal_cdf.m
-share/octave/${PKGVERSION}/m/statistics/distributions/pascal_inv.m
-share/octave/${PKGVERSION}/m/statistics/distributions/pascal_pdf.m
-share/octave/${PKGVERSION}/m/statistics/distributions/pascal_rnd.m
 share/octave/${PKGVERSION}/m/statistics/distributions/poisscdf.m
 share/octave/${PKGVERSION}/m/statistics/distributions/poissinv.m
 share/octave/${PKGVERSION}/m/statistics/distributions/poisspdf.m
@@ -1407,14 +1511,15 @@ share/octave/${PKGVERSION}/m/statistics/distributions/tcdf.m
 share/octave/${PKGVERSION}/m/statistics/distributions/tinv.m
 share/octave/${PKGVERSION}/m/statistics/distributions/tpdf.m
 share/octave/${PKGVERSION}/m/statistics/distributions/trnd.m
+share/octave/${PKGVERSION}/m/statistics/distributions/unidrnd.m
 share/octave/${PKGVERSION}/m/statistics/distributions/unifcdf.m
 share/octave/${PKGVERSION}/m/statistics/distributions/unifinv.m
 share/octave/${PKGVERSION}/m/statistics/distributions/unifpdf.m
 share/octave/${PKGVERSION}/m/statistics/distributions/unifrnd.m
-share/octave/${PKGVERSION}/m/statistics/distributions/weibcdf.m
-share/octave/${PKGVERSION}/m/statistics/distributions/weibinv.m
-share/octave/${PKGVERSION}/m/statistics/distributions/weibpdf.m
-share/octave/${PKGVERSION}/m/statistics/distributions/weibrnd.m
+share/octave/${PKGVERSION}/m/statistics/distributions/wblcdf.m
+share/octave/${PKGVERSION}/m/statistics/distributions/wblinv.m
+share/octave/${PKGVERSION}/m/statistics/distributions/wblpdf.m
+share/octave/${PKGVERSION}/m/statistics/distributions/wblrnd.m
 share/octave/${PKGVERSION}/m/statistics/distributions/wienrnd.m
 share/octave/${PKGVERSION}/m/statistics/models/logistic_regression.m
 share/octave/${PKGVERSION}/m/statistics/models/logistic_regression_derivatives.m
@@ -1456,6 +1561,7 @@ share/octave/${PKGVERSION}/m/strings/hex2dec.m
 share/octave/${PKGVERSION}/m/strings/index.m
 share/octave/${PKGVERSION}/m/strings/isletter.m
 share/octave/${PKGVERSION}/m/strings/lower.m
+share/octave/${PKGVERSION}/m/strings/mat2str.m
 share/octave/${PKGVERSION}/m/strings/rindex.m
 share/octave/${PKGVERSION}/m/strings/split.m
 share/octave/${PKGVERSION}/m/strings/str2double.m
@@ -1463,24 +1569,44 @@ 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/strcmpi.m
+share/octave/${PKGVERSION}/m/strings/strfind.m
 share/octave/${PKGVERSION}/m/strings/strjust.m
 share/octave/${PKGVERSION}/m/strings/strmatch.m
-share/octave/${PKGVERSION}/m/strings/strncmp.m
+share/octave/${PKGVERSION}/m/strings/strncmpi.m
 share/octave/${PKGVERSION}/m/strings/strrep.m
+share/octave/${PKGVERSION}/m/strings/strtok.m
+share/octave/${PKGVERSION}/m/strings/strtrunc.m
+share/octave/${PKGVERSION}/m/strings/strvcat.m
 share/octave/${PKGVERSION}/m/strings/substr.m
 share/octave/${PKGVERSION}/m/strings/upper.m
+share/octave/${PKGVERSION}/m/testfun/PKG_ADD
+share/octave/${PKGVERSION}/m/testfun/assert.m
+share/octave/${PKGVERSION}/m/testfun/demo.m
+share/octave/${PKGVERSION}/m/testfun/example.m
+share/octave/${PKGVERSION}/m/testfun/fail.m
+share/octave/${PKGVERSION}/m/testfun/speed.m
+share/octave/${PKGVERSION}/m/testfun/test.m
 share/octave/${PKGVERSION}/m/time/asctime.m
+share/octave/${PKGVERSION}/m/time/calendar.m
 share/octave/${PKGVERSION}/m/time/clock.m
 share/octave/${PKGVERSION}/m/time/ctime.m
 share/octave/${PKGVERSION}/m/time/date.m
+share/octave/${PKGVERSION}/m/time/datenum.m
+share/octave/${PKGVERSION}/m/time/datestr.m
+share/octave/${PKGVERSION}/m/time/datevec.m
+share/octave/${PKGVERSION}/m/time/eomday.m
+share/octave/${PKGVERSION}/m/time/etime.m
+share/octave/${PKGVERSION}/m/time/is_leap_year.m
+share/octave/${PKGVERSION}/m/time/now.m
+share/octave/${PKGVERSION}/m/time/tic.m
+share/octave/${PKGVERSION}/m/time/toc.m
+share/octave/${PKGVERSION}/m/time/weekday.m
 share/octave/ls-R
 share/octave/site/m/startup/octaverc
 @dirrm share/octave/site/m/startup
-@dirrm share/octave/site/api-v17/m
-@dirrm share/octave/site/api-v17
-@dirrm share/octave/${PKGVERSION}/site/m
-@dirrm share/octave/${PKGVERSION}/site
+@comment @dirrm share/octave/site/m
 @dirrm share/octave/${PKGVERSION}/m/time
+@dirrm share/octave/${PKGVERSION}/m/testfun
 @dirrm share/octave/${PKGVERSION}/m/strings
 @dirrm share/octave/${PKGVERSION}/m/statistics/tests
 @dirrm share/octave/${PKGVERSION}/m/statistics/models
@@ -1496,11 +1622,14 @@ share/octave/site/m/startup/octaverc
 @dirrm share/octave/${PKGVERSION}/m/quaternion
 @dirrm share/octave/${PKGVERSION}/m/polynomial
 @dirrm share/octave/${PKGVERSION}/m/plot
+@dirrm share/octave/${PKGVERSION}/m/pkg
+@dirrm share/octave/${PKGVERSION}/m/path
 @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
 @dirrm share/octave/${PKGVERSION}/m/image
+@dirrm share/octave/${PKGVERSION}/m/geometry
 @dirrm share/octave/${PKGVERSION}/m/general
 @dirrm share/octave/${PKGVERSION}/m/finance
 @dirrm share/octave/${PKGVERSION}/m/elfun
@@ -1516,25 +1645,23 @@ share/octave/site/m/startup/octaverc
 @dirrm share/octave/${PKGVERSION}/imagelib
 @dirrm share/octave/${PKGVERSION}/doc
 @dirrm share/octave/${PKGVERSION}
-@dirrm share/doc/html/octave
-@dirrm libexec/octave/site/oct/api-v17/${GNU_PLATFORM_DIR}
-@dirrm libexec/octave/site/oct/api-v17
-@dirrm libexec/octave/site/oct/${GNU_PLATFORM_DIR}
-@dirrm libexec/octave/site/oct
-@dirrm libexec/octave/site/exec/${GNU_PLATFORM_DIR}
+@comment @dirrm share/octave
+@comment in xdg-dirs: @dirrm share/applications
+@exec ${MKDIR} %D/libexec/octave/site/exec/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/site/exec/${MACHINE_GNU_PLATFORM}
 @dirrm libexec/octave/site/exec
 @dirrm libexec/octave/site
-@dirrm libexec/octave/${PKGVERSION}/site/oct/${GNU_PLATFORM_DIR}
-@dirrm libexec/octave/${PKGVERSION}/site/oct
-@dirrm libexec/octave/${PKGVERSION}/site/exec/${GNU_PLATFORM_DIR}
+@exec ${MKDIR} %D/libexec/octave/${PKGVERSION}/site/exec/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/${PKGVERSION}/site/exec/${MACHINE_GNU_PLATFORM}
 @dirrm libexec/octave/${PKGVERSION}/site/exec
 @dirrm libexec/octave/${PKGVERSION}/site
-@dirrm libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}
+@dirrm libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}
 @dirrm libexec/octave/${PKGVERSION}/oct
-@dirrm libexec/octave/${PKGVERSION}/exec/${GNU_PLATFORM_DIR}
+@dirrm libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}
 @dirrm libexec/octave/${PKGVERSION}/exec
 @dirrm libexec/octave/${PKGVERSION}
 @dirrm libexec/octave
+@exec ${MKDIR} %D/lib/octave-${PKGVERSION}
 @dirrm lib/octave-${PKGVERSION}
 @dirrm include/octave-${PKGVERSION}/octave
 @dirrm include/octave-${PKGVERSION}
diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index 5874207e03b..304a1cd4a12 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.35 2006/01/06 22:41:48 adam Exp $
+$NetBSD: distinfo,v 1.36 2007/09/19 18:09:16 drochner Exp $
 
-SHA1 (octave-2.9.4.tar.bz2) = d41bff7606cebf2059e189fd74dd88c6a605b239
-RMD160 (octave-2.9.4.tar.bz2) = 3616cc07e4147cf1d91cbd0eb1cb5cc1fb1cc682
-Size (octave-2.9.4.tar.bz2) = 6189171 bytes
-SHA1 (patch-aa) = 06884718912f2248807a47654751d7b7ee406d85
-SHA1 (patch-ab) = f8070cc91772f44cf936fb80738af8e5190487f0
-SHA1 (patch-ac) = 23046877d552df47d7cfaa1acce7c8c1f015f5c0
-SHA1 (patch-ad) = 01d0fb5878897a91d33e2cb7cbc6d2575a04c464
-SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111
-SHA1 (patch-af) = 08b20ca1a8291405368a2c0dc8509173b8f46f95
-SHA1 (patch-ag) = e252ff405bbad41a564595eda782fd724de1ff19
+SHA1 (octave-2.9.14.tar.bz2) = f97ae13c931276a359312ceb5f957df23d723c6a
+RMD160 (octave-2.9.14.tar.bz2) = d5b9904501cabdea63329d116c4c8e6d3716327b
+Size (octave-2.9.14.tar.bz2) = 9405249 bytes
+SHA1 (patch-aa) = 71bf69fe3ba5f3c877a7b20753913b0cc03b2820
+SHA1 (patch-ab) = 934da18e362b8676b8fc0d29f313c5dbbbd6aa57
+SHA1 (patch-ac) = 73c1f7ee93f7afc9b5420d37ee61a9902c79b583
+SHA1 (patch-ad) = 776003d0000ff518b70ad92f118ebdd505a112dd
+SHA1 (patch-ae) = 0a07bf983831cdd75f9e3f8e83974168514e93ab
+SHA1 (patch-af) = 7edb2c44fa8886c84d79692fc3574b97f09d32c4
+SHA1 (patch-ag) = 2c8dee1e65a4cacbb29432844baaa70c4a4a7863
 SHA1 (patch-ah) = f0f1989b0f6979f4978d7f6130b1d8d0776c1580
diff --git a/math/octave-current/options.mk b/math/octave-current/options.mk
index dbf9c5d297e..24f03f7a70e 100644
--- a/math/octave-current/options.mk
+++ b/math/octave-current/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:38 dillo Exp $
+# $NetBSD: options.mk,v 1.3 2007/09/19 18:09:16 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.octave
-PKG_SUPPORTED_OPTIONS=	glpk hdf5
-PKG_SUGGESTED_OPTIONS=	glpk hdf5
+PKG_SUPPORTED_OPTIONS=	glpk hdf5 pcre qhull
+PKG_SUGGESTED_OPTIONS=	glpk hdf5 pcre qhull
 
 .include "../../mk/bsd.options.mk"
 
@@ -17,3 +17,15 @@ CONFIGURE_ARGS+=	--without-glpk
 .else
 CONFIGURE_ARGS+=	--without-hdf5
 .endif
+
+.if !empty(PKG_OPTIONS:Mpcre)
+.include "../../devel/pcre/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-pcre
+.endif
+
+.if !empty(PKG_OPTIONS:Mqhull)
+.include "../../math/qhull/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-qhull
+.endif
diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa
index fd42d3b39d3..f1f3a2fd0ea 100644
--- a/math/octave-current/patches/patch-aa
+++ b/math/octave-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.16 2006/01/06 22:41:48 adam Exp $
+$NetBSD: patch-aa,v 1.17 2007/09/19 18:09:16 drochner Exp $
 
---- configure.orig	2005-11-11 20:57:06.000000000 +0100
+--- configure.orig	2007-09-17 22:49:11.000000000 +0200
 +++ configure
-@@ -10554,7 +10554,7 @@ if $have_fortran_compiler; then
+@@ -12339,7 +12339,7 @@ if $have_fortran_compiler; then
  %.c : %.f
  
  %.o : %.f
@@ -11,16 +11,16 @@ $NetBSD: patch-aa,v 1.16 2006/01/06 22:41:48 adam Exp $
  
  pic/%.o : %.f
  	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
-@@ -14680,7 +14680,7 @@ TEMPLATE_AR='$(AR)'
- TEMPLATE_ARFLAGS="$ARFLAGS"
+@@ -16736,7 +16736,7 @@ OCTAVE_DLL_DEFS=
+ OCTINTERP_DLL_DEFS=
  library_path_var=LD_LIBRARY_PATH
  case "$canonical_host_type" in
--  *-*-386bsd* | *-*-openbsd* | *-*-netbsd*)
-+  *-*-386bsd* | *-*-openbsd* )
+-  *-*-386bsd* | *-*-netbsd*)
++  *-*-386bsd*)
      SH_LD=ld
      SH_LDFLAGS=-Bshareable
    ;;
-@@ -24838,19 +24838,19 @@ case "$canonical_host_type" in
+@@ -27024,19 +27024,19 @@ case "$canonical_host_type" in
      cat << \EOF > $bsd_gcc_kluge_targets_frag
  
  lex.o: lex.cc
@@ -45,14 +45,3 @@ $NetBSD: patch-aa,v 1.16 2006/01/06 22:41:48 adam Exp $
  
  EOF
    ;;
-@@ -24978,9 +24978,9 @@ then
-   rm -rf "$tmp"
- 
- fi
-+SED=$octave_cv_path_sed
- 
- fi
--SED=$octave_cv_path_sed
- 
- echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6
diff --git a/math/octave-current/patches/patch-ab b/math/octave-current/patches/patch-ab
index 82619376c98..d48c7f177f6 100644
--- a/math/octave-current/patches/patch-ab
+++ b/math/octave-current/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2005/12/08 14:35:01 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2007/09/19 18:09:16 drochner Exp $
 
---- src/DLD-FUNCTIONS/__glpk__.cc.orig	2005-05-18 12:21:01.000000000 +0000
+--- src/DLD-FUNCTIONS/__glpk__.cc.orig	2007-04-04 05:22:17.000000000 +0200
 +++ src/DLD-FUNCTIONS/__glpk__.cc
 @@ -26,6 +26,7 @@ Software Foundation, Inc., 51 Franklin S
  #endif
@@ -20,4 +20,4 @@ $NetBSD: patch-ab,v 1.5 2005/12/08 14:35:01 joerg Exp $
 +
  #if defined (HAVE_GLPK)
  
- extern "C" {
+ extern "C"
diff --git a/math/octave-current/patches/patch-ac b/math/octave-current/patches/patch-ac
index 198102be793..879e114284f 100644
--- a/math/octave-current/patches/patch-ac
+++ b/math/octave-current/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.7 2006/01/06 22:41:48 adam Exp $
+$NetBSD: patch-ac,v 1.8 2007/09/19 18:09:17 drochner Exp $
 
---- Makeconf.in.orig	2005-11-11 20:47:12.000000000 +0100
+--- Makeconf.in.orig	2007-07-24 18:38:46.000000000 +0200
 +++ Makeconf.in
-@@ -78,7 +78,7 @@ SHLBIN = @SHLBIN@
+@@ -86,7 +86,7 @@ SHLBIN = @SHLBIN@
  SHLBIN_VER = @SHLBIN_VER@
  SHLLINKEXT=
  
 -LIBEXT = a
 +LIBEXT = la
+ LIBPRE = @LIBPRE@
  
  # Fortran to C translator and associated flags.
- 
-@@ -171,7 +171,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@
+@@ -188,7 +188,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@
  SH_LD = @SH_LD@
  SH_LDFLAGS = @SH_LDFLAGS@
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.7 2006/01/06 22:41:48 adam Exp $
  DL_LDFLAGS = @DL_LDFLAGS@
  
  SONAME_FLAGS = @SONAME_FLAGS@
-@@ -361,10 +361,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
+@@ -370,10 +370,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 f9146a633b1..be05ea9da1a 100644
--- a/math/octave-current/patches/patch-ad
+++ b/math/octave-current/patches/patch-ad
@@ -1,27 +1,27 @@
-$NetBSD: patch-ad,v 1.6 2005/04/01 10:15:19 adam Exp $
+$NetBSD: patch-ad,v 1.7 2007/09/19 18:09:17 drochner Exp $
 
---- libcruft/Makefile.in.orig	2005-03-09 15:22:58.000000000 +0000
+--- libcruft/Makefile.in.orig	2007-07-25 17:49:17.000000000 +0200
 +++ libcruft/Makefile.in
-@@ -93,8 +93,8 @@ libraries: $(SUBDIRS)
+@@ -108,8 +108,8 @@ libraries: cruft.def
  
- libcruft.$(LIBEXT): $(CRUFT_OBJ)
+ $(LIBPRE)cruft.$(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.9.%=2:%}
  
- libcruft.$(SHLEXT_VER): libcruft.$(SHLEXT)
+ $(LIBPRE)cruft.$(SHLEXT_VER): $(LIBPRE)cruft.$(SHLEXT)
  	rm -f $@
-@@ -119,9 +119,8 @@ install::
+@@ -134,9 +134,8 @@ install::
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
- 	  rm -f $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
--	  $(INSTALL_DATA) libcruft.$(LIBEXT) \
--	    $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
--	  $(RANLIB) $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
+ 	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
+-	  $(INSTALL_DATA) $(LIBPRE)cruft.$(LIBEXT) \
+-	    $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
+-	  $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
 +	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcruft.$(LIBEXT) \
-+	    ${PREFIX}/lib; \
++		${PREFIX}/lib; \
  	fi
  	if $(SHARED_LIBS); then \
- 	  rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB_VER); \
+ 	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER); \
diff --git a/math/octave-current/patches/patch-ae b/math/octave-current/patches/patch-ae
index 06c7dbf343e..58072b0fd30 100644
--- a/math/octave-current/patches/patch-ae
+++ b/math/octave-current/patches/patch-ae
@@ -1,12 +1,12 @@
-$NetBSD: patch-ae,v 1.3 2003/12/04 11:15:37 adam Exp $
+$NetBSD: patch-ae,v 1.4 2007/09/19 18:09:17 drochner Exp $
 
---- libcruft/misc/Makefile.in.orig	2003-11-20 13:50:06.000000000 +0100
+--- libcruft/misc/Makefile.in.orig	2007-04-04 18:10:26.000000000 +0200
 +++ libcruft/misc/Makefile.in
-@@ -62,7 +62,7 @@ XCC = $(patsubst -O%, , $(CC))
+@@ -51,7 +51,7 @@ XCC = $(patsubst -O%, , $(CC))
  XALL_CFLAGS = $(patsubst -O%, , $(ALL_CFLAGS))
  
  machar.o: $(srcdir)/machar.c
--	$(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $<
+-	$(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $< -o $@
 +	${LIBTOOL} --mode=compile $(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $<
  
  pic/machar.o: $(srcdir)/machar.c
diff --git a/math/octave-current/patches/patch-af b/math/octave-current/patches/patch-af
index 81c48f98c6b..1b5a5607ca5 100644
--- a/math/octave-current/patches/patch-af
+++ b/math/octave-current/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.11 2006/01/06 22:41:48 adam Exp $
+$NetBSD: patch-af,v 1.12 2007/09/19 18:09:17 drochner Exp $
 
---- liboctave/Makefile.in.orig	2005-11-11 20:47:23.000000000 +0100
+--- liboctave/Makefile.in.orig	2007-07-25 17:45:05.000000000 +0200
 +++ liboctave/Makefile.in
-@@ -225,8 +225,9 @@ endif
+@@ -244,8 +244,9 @@ endif
  
- liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
+ $(LIBPRE)octave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
  	rm -f $@
 -	$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $(LIBOCTAVE_OBJECTS)
 -	$(RANLIB) $@
@@ -12,17 +12,17 @@ $NetBSD: patch-af,v 1.11 2006/01/06 22:41:48 adam Exp $
 +		$(LIBOCTAVE_OBJECTS:.o=.lo) -rpath ${PREFIX}/lib \
 +		-version-info ${version:2.9.%=2:%}
  
- liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT)
+ $(LIBPRE)octave.$(SHLEXT_VER): $(LIBPRE)octave.$(SHLEXT)
  	rm -f $@
-@@ -253,9 +254,8 @@ install-lib:
+@@ -272,9 +273,8 @@ install-lib:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
- 	  rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
--	  $(INSTALL_DATA) liboctave.$(LIBEXT) \
--	    $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
--	  $(RANLIB) $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
+ 	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
+-	  $(INSTALL_DATA) $(LIBPRE)octave.$(LIBEXT) \
+-	    $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
+-	  $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
 +	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctave.$(LIBEXT) \
-+	    ${PREFIX}/lib; \
++		${PREFIX}/lib; \
  	fi
  	if $(SHARED_LIBS); then \
- 	  rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER); \
+ 	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB_VER); \
diff --git a/math/octave-current/patches/patch-ag b/math/octave-current/patches/patch-ag
index 081ea44e0c8..1665737545d 100644
--- a/math/octave-current/patches/patch-ag
+++ b/math/octave-current/patches/patch-ag
@@ -1,10 +1,19 @@
-$NetBSD: patch-ag,v 1.15 2006/01/06 22:41:48 adam Exp $
+$NetBSD: patch-ag,v 1.16 2007/09/19 18:09:17 drochner Exp $
 
---- src/Makefile.in.orig	2005-11-11 20:48:04.000000000 +0100
+--- src/Makefile.in.orig	2007-09-17 22:47:41.000000000 +0200
 +++ src/Makefile.in
-@@ -291,8 +291,9 @@ libraries: $(LIBRARIES)
+@@ -191,7 +191,7 @@ BUILT_EXTRAS := graphics.h mxarray.h
  
- liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
+ EXTRAS := ov-base-int.cc ov-base-mat.cc ov-base-scalar.cc
+ 
+-EXTRA_OBJECTS := oct-errno.o octave.o builtins.o ops.o
++EXTRA_OBJECTS := oct-errno.o builtins.o ops.o
+ 
+ INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS) $(BUILT_EXTRAS)
+ 
+@@ -305,8 +305,9 @@ libraries: $(LIBRARIES)
+ 
+ $(LIBPRE)octinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
  	rm -f $@
 -	$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^
 -	$(RANLIB) $@
@@ -12,16 +21,16 @@ $NetBSD: patch-ag,v 1.15 2006/01/06 22:41:48 adam Exp $
 +		$(OBJECTS:.o=.lo) $(XERBLA:.o=.lo) -rpath ${PREFIX}/lib \
 +		-version-info ${version:2.9.%=2:%}
  
- liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT)
+ $(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBPRE)octinterp.$(SHLEXT)
  	rm -f $@
-@@ -300,12 +301,13 @@ liboctinterp.$(SHLEXT_VER): liboctinterp
+@@ -314,12 +315,13 @@ $(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBP
  
- liboctinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
+ $(LIBPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
  	rm -f $@
 -	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
 +	${LIBTOOL} --mode=link $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
  
- stamp-prereq: defaults.h oct-conf.h oct-gperf.h parse.cc lex.cc gplot.cc $(OPT_HANDLERS)
+ stamp-prereq: defaults.h graphics.h oct-conf.h oct-gperf.h parse.cc lex.cc __gnuplot_raw__.cc $(OPT_HANDLERS)
  	touch stamp-prereq
  
  octave$(EXEEXT): stamp-prereq $(LIBRARIES) main.o $(DLD_STATIC_OBJ)
@@ -29,7 +38,7 @@ $NetBSD: patch-ag,v 1.15 2006/01/06 22:41:48 adam Exp $
  	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
  	$(ALL_LDFLAGS) -o $@ \
  	main.o $(DLD_STATIC_OBJ) \
-@@ -392,6 +394,7 @@ install-strip:
+@@ -410,6 +412,7 @@ install-strip:
  install-bin:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  	rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
@@ -37,27 +46,23 @@ $NetBSD: patch-ag,v 1.15 2006/01/06 22:41:48 adam Exp $
  	$(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
  	cd $(DESTDIR)$(bindir) ; $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT)
  .PHONY: install-bin
-@@ -401,9 +404,10 @@ install-oct:
+@@ -420,6 +423,7 @@ install-oct:
  	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-pkg-add --prefix $(octfiledir) $(DLD_DEF_FILES) > $(DESTDIR)$(octfiledir)/PKG_ADD
-+	  $(srcdir)/mk-pkg-add --prefix $(octfiledir) $(DLD_DEF_FILES) > $(DESTDIR)$(octfiledir)/PKG_ADD; \
  	fi
- .PHONY: install-oct
- 
-@@ -411,9 +415,8 @@ install-lib:
+@@ -429,9 +433,8 @@ install-lib:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
- 	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
--	  $(INSTALL_DATA) liboctinterp.$(LIBEXT) \
--	    $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
--	  $(RANLIB) $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
+ 	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
+-	  $(INSTALL_DATA) $(LIBPRE)octinterp.$(LIBEXT) \
+-	    $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
+-	  $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
 +	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctinterp.$(LIBEXT) \
-+	    ${PREFIX}/lib; \
++		${PREFIX}/lib; \
  	fi
  	if $(SHARED_LIBS); then \
- 	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLEXT_VER); \
+ 	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLEXT_VER); \
-- 
cgit v1.2.3