Changes 2.9.19:

* bug fixes

13 files changed, 126 insertions, 136 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index e1d14ac9874..6a3457fb3ae 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2007/12/02 11:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2007/12/15 05:54:50 adam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGNAME=	octave-current-${OCTAVE_VER}
-PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/
 EXTRACT_SUFX=	.tar.bz2
@@ -15,7 +14,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.14
+OCTAVE_VER=	2.9.19
 CONFLICTS+=	octave-2.*
 
 .if (${MACHINE_ARCH} == "arm32")
@@ -44,32 +43,33 @@ TOOLS_PLATFORM.gsed=	#empty
 .include "options.mk"
 
 GNU_PLATFORM_DIR!=	${.CURDIR}/../../mk/gnu-config/config.sub ${MACHINE_GNU_PLATFORM}
-PLIST_SUBST+=		GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR:Q}
+PLIST_SUBST+=		GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR}
 
-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
+INFO_FILES=	yes
+OCTAVE_DOC=	faq/Octave-FAQ.ps  liboctave/liboctave.ps \
+		refcard/refcard-a4.ps refcard/refcard-legal.ps \
+		refcard/refcard-letter.ps
 
-UNWRAP_FILES+=	mkoctfile octave-bug src/oct-conf.h
+INSTALLATION_DIRS+=	share/octave/${OCTAVE_VER}/doc
+UNWRAP_FILES+=		mkoctfile octave-bug src/oct-conf.h
 
 post-extract:
-	${FIND} ${WRKSRC}/doc -type f -name '*.info*' -print | ${XARGS} ${RM} -f
-	${MKDIR} ${WRKSRC}/src/pic
+	find ${WRKSRC}/doc -type f -name '*.info*' -print | xargs rm -f
+	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
 post-build:
-	${MV} ${WRKSRC}/mkoctfile ${WRKSRC}/mkoctfile.bak
-	${SED}	-e 's;"${CC}";"${CCPATH}";g' \
+	mv ${WRKSRC}/mkoctfile ${WRKSRC}/mkoctfile.bak
+	sed	-e 's;"${CC}";"${CCPATH}";g' \
 		-e 's;"${CXX}";"${CXXPATH}";g' \
 		-e 's;"${FC}";"${FCPATH}";g' \
 		-e 's@^:[ \t]*\$${SED=.*@: \$$\{SED="${SED}"\}@g' \
 		${WRKSRC}/mkoctfile.bak > ${WRKSRC}/mkoctfile
-	${CHMOD} a+x ${WRKSRC}/mkoctfile
-	(cd ${WRKSRC}/doc/interpreter && ${GMAKE} octave.ps)
+	chmod a+x ${WRKSRC}/mkoctfile
+	(cd ${WRKSRC}/doc/interpreter && gmake octave.ps)
 
 post-install:
 	cd ${WRKSRC}/doc/liboctave;					\
@@ -77,7 +77,6 @@ post-install:
 		${TEST} ! -f "$$f" ||					\
 		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
 	done
-	${INSTALL_DATA_DIR} ${PREFIX}/share/octave/${OCTAVE_VER}/doc
 .for f in ${OCTAVE_DOC}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/octave/${OCTAVE_VER}/doc
 .endfor
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index 4884a2759e5..1e3210964f9 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2007/09/19 18:09:16 drochner Exp $
+@comment $NetBSD: PLIST,v 1.23 2007/12/15 05:54:50 adam Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
@@ -48,7 +48,6 @@ include/octave-${PKGVERSION}/octave/DiagArray2.h
 include/octave-${PKGVERSION}/octave/EIG.h
 include/octave-${PKGVERSION}/octave/FEGrid.h
 include/octave-${PKGVERSION}/octave/LP.h
-include/octave-${PKGVERSION}/octave/LPsolve.h
 include/octave-${PKGVERSION}/octave/LSODE-opts.h
 include/octave-${PKGVERSION}/octave/LSODE.h
 include/octave-${PKGVERSION}/octave/LinConst.h
@@ -96,6 +95,7 @@ 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/builtins.h
 include/octave-${PKGVERSION}/octave/byte-swap.h
 include/octave-${PKGVERSION}/octave/c-file-ptr-stream.h
 include/octave-${PKGVERSION}/octave/chMatrix.h
@@ -120,6 +120,7 @@ include/octave-${PKGVERSION}/octave/dbleQR.h
 include/octave-${PKGVERSION}/octave/dbleQRP.h
 include/octave-${PKGVERSION}/octave/dbleSCHUR.h
 include/octave-${PKGVERSION}/octave/dbleSVD.h
+include/octave-${PKGVERSION}/octave/debug.h
 include/octave-${PKGVERSION}/octave/defaults.h
 include/octave-${PKGVERSION}/octave/defun-dld.h
 include/octave-${PKGVERSION}/octave/defun-int.h
@@ -152,6 +153,7 @@ include/octave-${PKGVERSION}/octave/lex.h
 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-math.h
 include/octave-${PKGVERSION}/octave/lo-specfun.h
 include/octave-${PKGVERSION}/octave/lo-sysdep.h
 include/octave-${PKGVERSION}/octave/lo-utils.h
@@ -656,7 +658,6 @@ 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
@@ -692,11 +693,9 @@ man/man1/mkoctfile.1
 man/man1/octave-bug.1
 man/man1/octave-config.1
 man/man1/octave.1
-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
 share/octave/${PKGVERSION}/doc/refcard-a4.ps
 share/octave/${PKGVERSION}/doc/refcard-legal.ps
 share/octave/${PKGVERSION}/doc/refcard-letter.ps
@@ -1082,6 +1081,7 @@ 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/gmap40.m
 share/octave/${PKGVERSION}/m/image/gray.m
 share/octave/${PKGVERSION}/m/image/gray2ind.m
 share/octave/${PKGVERSION}/m/image/hot.m
@@ -1109,8 +1109,10 @@ 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/__norm__.m
 share/octave/${PKGVERSION}/m/linear-algebra/commutation_matrix.m
 share/octave/${PKGVERSION}/m/linear-algebra/cond.m
+share/octave/${PKGVERSION}/m/linear-algebra/condest.m
 share/octave/${PKGVERSION}/m/linear-algebra/cross.m
 share/octave/${PKGVERSION}/m/linear-algebra/dmult.m
 share/octave/${PKGVERSION}/m/linear-algebra/dot.m
@@ -1119,8 +1121,8 @@ share/octave/${PKGVERSION}/m/linear-algebra/housh.m
 share/octave/${PKGVERSION}/m/linear-algebra/krylov.m
 share/octave/${PKGVERSION}/m/linear-algebra/krylovb.m
 share/octave/${PKGVERSION}/m/linear-algebra/logm.m
-share/octave/${PKGVERSION}/m/linear-algebra/norm.m
 share/octave/${PKGVERSION}/m/linear-algebra/null.m
+share/octave/${PKGVERSION}/m/linear-algebra/onenormest.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
@@ -1138,7 +1140,6 @@ 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
@@ -1152,6 +1153,7 @@ 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/ismac.m
 share/octave/${PKGVERSION}/m/miscellaneous/ispc.m
 share/octave/${PKGVERSION}/m/miscellaneous/isunix.m
 share/octave/${PKGVERSION}/m/miscellaneous/license.m
@@ -1185,6 +1187,7 @@ 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/what.m
 share/octave/${PKGVERSION}/m/miscellaneous/xor.m
 share/octave/${PKGVERSION}/m/miscellaneous/zip.m
 share/octave/${PKGVERSION}/m/optimization/__fsolve_defopts__.m
@@ -1197,8 +1200,12 @@ 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/__area__.m
+share/octave/${PKGVERSION}/m/plot/__axes_limits__.m
 share/octave/${PKGVERSION}/m/plot/__axis_label__.m
 share/octave/${PKGVERSION}/m/plot/__bar__.m
+share/octave/${PKGVERSION}/m/plot/__bars__.m
+share/octave/${PKGVERSION}/m/plot/__contour__.m
 share/octave/${PKGVERSION}/m/plot/__default_plot_options__.m
 share/octave/${PKGVERSION}/m/plot/__errcomm__.m
 share/octave/${PKGVERSION}/m/plot/__errplot__.m
@@ -1222,24 +1229,36 @@ 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/__quiver__.m
+share/octave/${PKGVERSION}/m/plot/__scatter__.m
+share/octave/${PKGVERSION}/m/plot/__stem__.m
 share/octave/${PKGVERSION}/m/plot/ancestor.m
+share/octave/${PKGVERSION}/m/plot/area.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/barh.m
 share/octave/${PKGVERSION}/m/plot/box.m
+share/octave/${PKGVERSION}/m/plot/caxis.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/colorbar.m
 share/octave/${PKGVERSION}/m/plot/contour.m
+share/octave/${PKGVERSION}/m/plot/contour3.m
 share/octave/${PKGVERSION}/m/plot/contourc.m
+share/octave/${PKGVERSION}/m/plot/contourf.m
+share/octave/${PKGVERSION}/m/plot/cylinder.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/fill.m
+share/octave/${PKGVERSION}/m/plot/findobj.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/hidden.m
 share/octave/${PKGVERSION}/m/plot/hist.m
 share/octave/${PKGVERSION}/m/plot/hold.m
 share/octave/${PKGVERSION}/m/plot/isfigure.m
@@ -1251,35 +1270,58 @@ share/octave/${PKGVERSION}/m/plot/loglogerr.m
 share/octave/${PKGVERSION}/m/plot/mesh.m
 share/octave/${PKGVERSION}/m/plot/meshc.m
 share/octave/${PKGVERSION}/m/plot/meshgrid.m
+share/octave/${PKGVERSION}/m/plot/meshz.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/pareto.m
+share/octave/${PKGVERSION}/m/plot/pcolor.m
 share/octave/${PKGVERSION}/m/plot/patch.m
 share/octave/${PKGVERSION}/m/plot/peaks.m
+share/octave/${PKGVERSION}/m/plot/pie.m
 share/octave/${PKGVERSION}/m/plot/plot.m
 share/octave/${PKGVERSION}/m/plot/plot3.m
+share/octave/${PKGVERSION}/m/plot/plotyy.m
 share/octave/${PKGVERSION}/m/plot/polar.m
 share/octave/${PKGVERSION}/m/plot/print.m
+share/octave/${PKGVERSION}/m/plot/quiver.m
+share/octave/${PKGVERSION}/m/plot/quiver3.m
+share/octave/${PKGVERSION}/m/plot/ribbon.m
 share/octave/${PKGVERSION}/m/plot/replot.m
+share/octave/${PKGVERSION}/m/plot/scatter.m
+share/octave/${PKGVERSION}/m/plot/scatter3.m
 share/octave/${PKGVERSION}/m/plot/semilogx.m
 share/octave/${PKGVERSION}/m/plot/semilogxerr.m
 share/octave/${PKGVERSION}/m/plot/semilogy.m
 share/octave/${PKGVERSION}/m/plot/semilogyerr.m
+share/octave/${PKGVERSION}/m/plot/shading.m
 share/octave/${PKGVERSION}/m/plot/shg.m
+share/octave/${PKGVERSION}/m/plot/slice.m
 share/octave/${PKGVERSION}/m/plot/sombrero.m
+share/octave/${PKGVERSION}/m/plot/sphere.m
+share/octave/${PKGVERSION}/m/plot/spinmap.m
 share/octave/${PKGVERSION}/m/plot/stairs.m
 share/octave/${PKGVERSION}/m/plot/stem.m
+share/octave/${PKGVERSION}/m/plot/stem3.m
 share/octave/${PKGVERSION}/m/plot/subplot.m
+share/octave/${PKGVERSION}/m/plot/surf.m
+share/octave/${PKGVERSION}/m/plot/surface.m
+share/octave/${PKGVERSION}/m/plot/surfc.m
+share/octave/${PKGVERSION}/m/plot/surfnorm.m
 share/octave/${PKGVERSION}/m/plot/text.m
 share/octave/${PKGVERSION}/m/plot/title.m
 share/octave/${PKGVERSION}/m/plot/view.m
 share/octave/${PKGVERSION}/m/plot/xlabel.m
+share/octave/${PKGVERSION}/m/plot/xlim.m
 share/octave/${PKGVERSION}/m/plot/ylabel.m
+share/octave/${PKGVERSION}/m/plot/ylim.m
 share/octave/${PKGVERSION}/m/plot/zlabel.m
+share/octave/${PKGVERSION}/m/plot/zlim.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/mpoles.m
 share/octave/${PKGVERSION}/m/polynomial/pchip.m
 share/octave/${PKGVERSION}/m/polynomial/poly.m
 share/octave/${PKGVERSION}/m/polynomial/polyder.m
@@ -1511,6 +1553,9 @@ 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/unidcdf.m
+share/octave/${PKGVERSION}/m/statistics/distributions/unidinv.m
+share/octave/${PKGVERSION}/m/statistics/distributions/unidpdf.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
@@ -1575,6 +1620,7 @@ share/octave/${PKGVERSION}/m/strings/strmatch.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/strtrim.m
 share/octave/${PKGVERSION}/m/strings/strtrunc.m
 share/octave/${PKGVERSION}/m/strings/strvcat.m
 share/octave/${PKGVERSION}/m/strings/substr.m
@@ -1598,8 +1644,6 @@ 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
diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index c7b371d935c..a7a0bbb0e95 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.37 2007/09/24 20:56:46 drochner Exp $
+$NetBSD: distinfo,v 1.38 2007/12/15 05:54:50 adam Exp $
 
-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
-SHA1 (patch-ai) = 5137072d649ffe98f18eab992fcb24d0be38194a
-SHA1 (patch-aj) = a8881299270237a25880b29dbde997216637cdf3
+SHA1 (octave-2.9.19.tar.bz2) = 1cee64ccbcce0aca2b771175fcfbca817c9ba705
+RMD160 (octave-2.9.19.tar.bz2) = c0f7d7b384f3e2f51cdb7ee0360d4ddf52e4493a
+Size (octave-2.9.19.tar.bz2) = 9807420 bytes
+SHA1 (patch-aa) = 1c11f2fb487e505bc9d821d2affecfcc93be0257
+SHA1 (patch-ab) = d8d6dbbfdaa0a24f12c25cb1a816c5ce8d1641df
+SHA1 (patch-ac) = 5790b21c5a16f6fab53c0e41d6b3eafe90972e2d
+SHA1 (patch-ad) = 2957cf24dc019edc8d2c7a0347829ccae93adfbd
+SHA1 (patch-ae) = 97c3ea2393d40701e996ca650e8bcffec2bb56b9
+SHA1 (patch-af) = 495eb9a5431cfce68dd52b996c2e2e3f7c98b2b8
+SHA1 (patch-ag) = 824c9e56172c836a71442012a1e6ffbc9f8de723
+SHA1 (patch-ah) = 240fd27ce0b4b9a18e39851139cecd9c71a0bdcc
+SHA1 (patch-ai) = aa1dbef826fcd2bf0066db7fca4e0ea077b07268
diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa
index f1f3a2fd0ea..9d1088673b9 100644
--- a/math/octave-current/patches/patch-aa
+++ b/math/octave-current/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.17 2007/09/19 18:09:16 drochner Exp $
+$NetBSD: patch-aa,v 1.18 2007/12/15 05:54:50 adam Exp $
 
---- configure.orig	2007-09-17 22:49:11.000000000 +0200
+--- configure.orig	2007-12-05 16:41:30.000000000 +0100
 +++ configure
-@@ -12339,7 +12339,7 @@ if $have_fortran_compiler; then
- %.c : %.f
- 
- %.o : %.f
--	$(FC) -c $(ALL_FFLAGS) -o $@ $<
-+	${LIBTOOL} --mode=compile --tag=CC $(FC) -c $(ALL_FFLAGS) $<
- 
- pic/%.o : %.f
- 	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
-@@ -16736,7 +16736,7 @@ OCTAVE_DLL_DEFS=
+@@ -15732,7 +15732,7 @@ OCTAVE_DLL_DEFS=
  OCTINTERP_DLL_DEFS=
  library_path_var=LD_LIBRARY_PATH
  case "$canonical_host_type" in
@@ -20,28 +11,3 @@ $NetBSD: patch-aa,v 1.17 2007/09/19 18:09:16 drochner Exp $
      SH_LD=ld
      SH_LDFLAGS=-Bshareable
    ;;
-@@ -27024,19 +27024,19 @@ case "$canonical_host_type" in
-     cat << \EOF > $bsd_gcc_kluge_targets_frag
- 
- lex.o: lex.cc
--	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-+	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
- 
- pt-plot.o: pt-plot.cc
--	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-+	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
- 
- symtab.o: symtab.cc
--	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-+	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
- 
- toplev.o: toplev.cc
--	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-+	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
- 
- unwind-prot.o: unwind-prot.cc
--	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-+	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
- 
- EOF
-   ;;
diff --git a/math/octave-current/patches/patch-ab b/math/octave-current/patches/patch-ab
index d48c7f177f6..0cb2a48828d 100644
--- a/math/octave-current/patches/patch-ab
+++ b/math/octave-current/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2007/09/19 18:09:16 drochner Exp $
+$NetBSD: patch-ab,v 1.7 2007/12/15 05:54:50 adam Exp $
 
---- src/DLD-FUNCTIONS/__glpk__.cc.orig	2007-04-04 05:22:17.000000000 +0200
+--- src/DLD-FUNCTIONS/__glpk__.cc.orig	2007-10-12 23:27:34.000000000 +0200
 +++ src/DLD-FUNCTIONS/__glpk__.cc
-@@ -26,6 +26,7 @@ Software Foundation, Inc., 51 Franklin S
+@@ -25,6 +25,7 @@ along with Octave; see the file COPYING.
  #endif
  
  #include <cfloat>
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.6 2007/09/19 18:09:16 drochner Exp $
  #include <csetjmp>
  #include <ctime>
  
-@@ -36,6 +37,10 @@ Software Foundation, Inc., 51 Franklin S
+@@ -35,6 +36,10 @@ along with Octave; see the file COPYING.
  #include "oct-obj.h"
  #include "pager.h"
  
diff --git a/math/octave-current/patches/patch-ac b/math/octave-current/patches/patch-ac
index 879e114284f..d98393c936a 100644
--- a/math/octave-current/patches/patch-ac
+++ b/math/octave-current/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2007/09/19 18:09:17 drochner Exp $
+$NetBSD: patch-ac,v 1.9 2007/12/15 05:54:50 adam Exp $
 
---- Makeconf.in.orig	2007-07-24 18:38:46.000000000 +0200
+--- Makeconf.in.orig	2007-12-04 21:51:25.000000000 +0100
 +++ Makeconf.in
-@@ -86,7 +86,7 @@ SHLBIN = @SHLBIN@
+@@ -95,7 +95,7 @@ SHLBIN = @SHLBIN@
  SHLBIN_VER = @SHLBIN_VER@
  SHLLINKEXT=
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.8 2007/09/19 18:09:17 drochner Exp $
  LIBPRE = @LIBPRE@
  
  # Fortran to C translator and associated flags.
-@@ -188,7 +188,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@
+@@ -195,7 +195,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@
  SH_LD = @SH_LD@
  SH_LDFLAGS = @SH_LDFLAGS@
  
@@ -20,9 +20,13 @@ $NetBSD: patch-ac,v 1.8 2007/09/19 18:09:17 drochner Exp $
  DL_LDFLAGS = @DL_LDFLAGS@
  
  SONAME_FLAGS = @SONAME_FLAGS@
-@@ -370,10 +370,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
+@@ -365,13 +365,13 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
  # How to make .o files:
  
+ %.o : %.f
+-	$(FC) -c $(ALL_FFLAGS) -o $@ $<
++	${LIBTOOL} --mode=compile $(FC) -c $(ALL_FFLAGS) -o $@ $<
+ 
  %.o : %.c
 -	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -o $@
 +	${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -o $@
@@ -31,5 +35,5 @@ $NetBSD: patch-ac,v 1.8 2007/09/19 18:09:17 drochner Exp $
 -	$(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< -o $@
 +	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< -o $@
  
- pic/%.o : %.c
- 	$(CC) -c $(CPPFLAGS) $(CPICFLAG) $(ALL_CFLAGS) $< -o $@
+ pic/%.o : %.f
+ 	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
diff --git a/math/octave-current/patches/patch-ad b/math/octave-current/patches/patch-ad
index be05ea9da1a..20391fa7e88 100644
--- a/math/octave-current/patches/patch-ad
+++ b/math/octave-current/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2007/09/19 18:09:17 drochner Exp $
+$NetBSD: patch-ad,v 1.8 2007/12/15 05:54:50 adam Exp $
 
---- libcruft/Makefile.in.orig	2007-07-25 17:49:17.000000000 +0200
+--- libcruft/Makefile.in.orig	2007-10-12 23:27:12.000000000 +0200
 +++ libcruft/Makefile.in
-@@ -108,8 +108,8 @@ libraries: cruft.def
+@@ -121,8 +121,8 @@ libraries: cruft.def
  
  $(LIBPRE)cruft.$(LIBEXT): $(CRUFT_OBJ)
  	rm -f $@
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.7 2007/09/19 18:09:17 drochner Exp $
  
  $(LIBPRE)cruft.$(SHLEXT_VER): $(LIBPRE)cruft.$(SHLEXT)
  	rm -f $@
-@@ -134,9 +134,8 @@ install::
+@@ -147,9 +147,8 @@ install::
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
diff --git a/math/octave-current/patches/patch-ae b/math/octave-current/patches/patch-ae
index 58072b0fd30..0c8db5d6cf0 100644
--- a/math/octave-current/patches/patch-ae
+++ b/math/octave-current/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2007/09/19 18:09:17 drochner Exp $
+$NetBSD: patch-ae,v 1.5 2007/12/15 05:54:50 adam Exp $
 
---- libcruft/misc/Makefile.in.orig	2007-04-04 18:10:26.000000000 +0200
+--- libcruft/misc/Makefile.in.orig	2007-10-12 23:27:12.000000000 +0200
 +++ libcruft/misc/Makefile.in
-@@ -51,7 +51,7 @@ XCC = $(patsubst -O%, , $(CC))
+@@ -64,7 +64,7 @@ XCC = $(patsubst -O%, , $(CC))
  XALL_CFLAGS = $(patsubst -O%, , $(ALL_CFLAGS))
  
  machar.o: $(srcdir)/machar.c
diff --git a/math/octave-current/patches/patch-af b/math/octave-current/patches/patch-af
index 1b5a5607ca5..a5f415c7ff3 100644
--- a/math/octave-current/patches/patch-af
+++ b/math/octave-current/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.12 2007/09/19 18:09:17 drochner Exp $
+$NetBSD: patch-af,v 1.13 2007/12/15 05:54:50 adam Exp $
 
---- liboctave/Makefile.in.orig	2007-07-25 17:45:05.000000000 +0200
+--- liboctave/Makefile.in.orig	2007-11-30 19:53:30.000000000 +0100
 +++ liboctave/Makefile.in
-@@ -244,8 +244,9 @@ endif
+@@ -256,8 +256,9 @@ endif
  
  $(LIBPRE)octave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
  	rm -f $@
@@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.12 2007/09/19 18:09:17 drochner Exp $
  
  $(LIBPRE)octave.$(SHLEXT_VER): $(LIBPRE)octave.$(SHLEXT)
  	rm -f $@
-@@ -272,9 +273,8 @@ install-lib:
+@@ -284,9 +285,8 @@ install-lib:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
diff --git a/math/octave-current/patches/patch-ag b/math/octave-current/patches/patch-ag
index 1665737545d..a0ca46ac77c 100644
--- a/math/octave-current/patches/patch-ag
+++ b/math/octave-current/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.16 2007/09/19 18:09:17 drochner Exp $
+$NetBSD: patch-ag,v 1.17 2007/12/15 05:54:51 adam Exp $
 
---- src/Makefile.in.orig	2007-09-17 22:47:41.000000000 +0200
+--- src/Makefile.in.orig	2007-12-05 18:08:28.000000000 +0100
 +++ src/Makefile.in
-@@ -191,7 +191,7 @@ BUILT_EXTRAS := graphics.h mxarray.h
+@@ -204,7 +204,7 @@ BUILT_EXTRAS := graphics.h mxarray.h
  
  EXTRAS := ov-base-int.cc ov-base-mat.cc ov-base-scalar.cc
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.16 2007/09/19 18:09:17 drochner Exp $
  
  INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS) $(BUILT_EXTRAS)
  
-@@ -305,8 +305,9 @@ libraries: $(LIBRARIES)
+@@ -318,8 +318,9 @@ libraries: $(LIBRARIES)
  
  $(LIBPRE)octinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
  	rm -f $@
@@ -23,7 +23,7 @@ $NetBSD: patch-ag,v 1.16 2007/09/19 18:09:17 drochner Exp $
  
  $(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBPRE)octinterp.$(SHLEXT)
  	rm -f $@
-@@ -314,12 +315,13 @@ $(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBP
+@@ -327,12 +328,13 @@ $(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBP
  
  $(LIBPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
  	rm -f $@
@@ -38,7 +38,7 @@ $NetBSD: patch-ag,v 1.16 2007/09/19 18:09:17 drochner Exp $
  	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
  	$(ALL_LDFLAGS) -o $@ \
  	main.o $(DLD_STATIC_OBJ) \
-@@ -410,6 +412,7 @@ install-strip:
+@@ -421,6 +423,7 @@ install-strip:
  install-bin:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  	rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
@@ -46,7 +46,7 @@ $NetBSD: patch-ag,v 1.16 2007/09/19 18:09:17 drochner Exp $
  	$(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
  	cd $(DESTDIR)$(bindir) ; $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT)
  .PHONY: install-bin
-@@ -420,6 +423,7 @@ install-oct:
+@@ -431,6 +434,7 @@ install-oct:
  	if [ -n "$(OCT_FILES)" ]; then \
  	  xfiles="$(OCT_FILES)"; \
  	  for f in $$xfiles; do \
@@ -54,7 +54,7 @@ $NetBSD: patch-ag,v 1.16 2007/09/19 18:09:17 drochner Exp $
  	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \
  	  done; \
  	fi
-@@ -429,9 +433,8 @@ install-lib:
+@@ -440,9 +444,8 @@ install-lib:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
diff --git a/math/octave-current/patches/patch-ah b/math/octave-current/patches/patch-ah
index d87426b643c..6a43c1d5de8 100644
--- a/math/octave-current/patches/patch-ah
+++ b/math/octave-current/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2005/07/01 16:11:05 adam Exp $
+$NetBSD: patch-ah,v 1.6 2007/12/15 05:54:51 adam Exp $
 
---- liboctave/f2c-main.c.orig	2005-05-18 12:20:20.000000000 +0000
+--- liboctave/f2c-main.c.orig	2007-10-12 23:27:16.000000000 +0200
 +++ liboctave/f2c-main.c
-@@ -21,6 +21,10 @@ Software Foundation, Inc., 51 Franklin S
+@@ -20,6 +20,10 @@ along with Octave; see the file COPYING.
  
  */
  
diff --git a/math/octave-current/patches/patch-ai b/math/octave-current/patches/patch-ai
index a90b53b07a9..6bd5343b90e 100644
--- a/math/octave-current/patches/patch-ai
+++ b/math/octave-current/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2007/09/24 20:56:46 drochner Exp $
+$NetBSD: patch-ai,v 1.4 2007/12/15 05:54:51 adam Exp $
 
---- liboctave/oct-time.cc.orig	2007-09-24 13:33:47.000000000 +0200
+--- liboctave/oct-time.cc.orig	2007-11-30 19:53:30.000000000 +0100
 +++ liboctave/oct-time.cc
-@@ -35,6 +35,8 @@ Software Foundation, Inc., 51 Franklin S
+@@ -34,6 +34,8 @@ along with Octave; see the file COPYING.
  #include <unistd.h>
  #endif
  
@@ -19,5 +19,5 @@ $NetBSD: patch-ai,v 1.3 2007/09/24 20:56:46 drochner Exp $
 +  t.tm_isdst = -1;
 +  mktime(&t);
  
-   if (q)
-     nchars = q - p + 1;
+   // Fill in wday and yday, but only if mday is valid and the mon and year
+   // are filled in, avoiding issues with mktime and invalid dates.
diff --git a/math/octave-current/patches/patch-aj b/math/octave-current/patches/patch-aj
deleted file mode 100644
index 0baa5b1526d..00000000000
--- a/math/octave-current/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2007/09/24 20:56:46 drochner Exp $
-
---- src/syscalls.cc.orig	2007-09-24 16:38:36.000000000 +0200
-+++ src/syscalls.cc
-@@ -236,7 +236,7 @@ For example,\n\
- \n\
- @example\n\
- @group\n\
--[in, out, pid] = popen2 (\"sort\", \"-nr\");\n\
-+[in, out, pid] = popen2 (\"sort\", \"-r\");\n\
- fputs (in, \"these\\nare\\nsome\\nstrings\\n\");\n\
- fclose (in);\n\
- EAGAIN = errno (\"EAGAIN\");\n\
-@@ -352,7 +352,7 @@ fclose (out);\n\
- 
- %!test
- %!  if (isunix())
--%!    [in, out, pid] = popen2 ("sort", "-nr");
-+%!    [in, out, pid] = popen2 ("sort", "-r");
- %!    EAGAIN = errno ("EAGAIN");
- %!  else
- %!    [in, out, pid] = popen2 ("sort", "/R");