diff options
author | adam <adam@pkgsrc.org> | 2006-01-06 22:41:48 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2006-01-06 22:41:48 +0000 |
commit | 66ab7f531fdb4a787900d603b9e8cdcab7efda8a (patch) | |
tree | 58d8e8d7b2bef839fd70a94421bd5ca602789a5f | |
parent | caa5fedfbe046b1caa8e5472949d62b785888b6f (diff) | |
download | pkgsrc-66ab7f531fdb4a787900d603b9e8cdcab7efda8a.tar.gz |
Changes 2.9.4:
* Bug fixes and improvements
-rw-r--r-- | math/octave-current/Makefile | 5 | ||||
-rw-r--r-- | math/octave-current/PLIST | 285 | ||||
-rw-r--r-- | math/octave-current/buildlink3.mk | 3 | ||||
-rw-r--r-- | math/octave-current/distinfo | 16 | ||||
-rw-r--r-- | math/octave-current/octave.mk | 8 | ||||
-rw-r--r-- | math/octave-current/patches/patch-aa | 12 | ||||
-rw-r--r-- | math/octave-current/patches/patch-ac | 10 | ||||
-rw-r--r-- | math/octave-current/patches/patch-af | 8 | ||||
-rw-r--r-- | math/octave-current/patches/patch-ag | 26 |
9 files changed, 186 insertions, 187 deletions
diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile index 9ecce2fa3c4..730f4010b25 100644 --- a/math/octave-current/Makefile +++ b/math/octave-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2005/12/05 20:50:36 rillig Exp $ +# $NetBSD: Makefile,v 1.53 2006/01/06 22:41:48 adam Exp $ DISTNAME= octave-${OCTAVE_VER} PKGNAME= octave-current-${OCTAVE_VER} @@ -17,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.3 +OCTAVE_VER= 2.9.4 CONFLICTS+= octave-2.* .if (${MACHINE_ARCH} == "arm32") @@ -89,6 +89,7 @@ post-install: .include "../../audio/libsndfile/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" .include "../../math/blas/buildlink3.mk" .include "../../math/fftw/buildlink3.mk" .include "../../math/lapack/buildlink3.mk" diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST index c10e0ae47a3..18a3a88d8fa 100644 --- a/math/octave-current/PLIST +++ b/math/octave-current/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.19 2005/07/01 16:11:05 adam Exp $ -bin/mkoctfile +@comment $NetBSD: PLIST,v 1.20 2006/01/06 22:41:48 adam Exp $ bin/mkoctfile-${PKGVERSION} +bin/mkoctfile bin/octave bin/octave-${PKGVERSION} bin/octave-bug @@ -81,8 +81,10 @@ include/octave-${PKGVERSION}/octave/Quad.h include/octave-${PKGVERSION}/octave/Range.h include/octave-${PKGVERSION}/octave/Sparse-op-defs.h include/octave-${PKGVERSION}/octave/Sparse.h +include/octave-${PKGVERSION}/octave/SparseCmplxCHOL.h include/octave-${PKGVERSION}/octave/SparseCmplxLU.h include/octave-${PKGVERSION}/octave/SparseType.h +include/octave-${PKGVERSION}/octave/SparsedbleCHOL.h include/octave-${PKGVERSION}/octave/SparsedbleLU.h include/octave-${PKGVERSION}/octave/base-dae.h include/octave-${PKGVERSION}/octave/base-de.h @@ -418,6 +420,7 @@ 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-env.h +include/octave-${PKGVERSION}/octave/oct-errno.h include/octave-${PKGVERSION}/octave/oct-fftw.h include/octave-${PKGVERSION}/octave/oct-fstrm.h include/octave-${PKGVERSION}/octave/oct-getopt.h @@ -438,6 +441,7 @@ include/octave-${PKGVERSION}/octave/oct-rl-hist.h include/octave-${PKGVERSION}/octave/oct-shlib.h include/octave-${PKGVERSION}/octave/oct-sort.cc include/octave-${PKGVERSION}/octave/oct-sort.h +include/octave-${PKGVERSION}/octave/oct-sparse.h include/octave-${PKGVERSION}/octave/oct-spparms.h include/octave-${PKGVERSION}/octave/oct-stdstrm.h include/octave-${PKGVERSION}/octave/oct-stream.h @@ -548,9 +552,12 @@ include/octave-${PKGVERSION}/octave/smx-sm-cs.h include/octave-${PKGVERSION}/octave/smx-sm-m.h include/octave-${PKGVERSION}/octave/smx-sm-scm.h include/octave-${PKGVERSION}/octave/so-array.h +include/octave-${PKGVERSION}/octave/sparse-base-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-sort.h +include/octave-${PKGVERSION}/octave/sparse-util.h include/octave-${PKGVERSION}/octave/sparse-xdiv.h include/octave-${PKGVERSION}/octave/sparse-xpow.h include/octave-${PKGVERSION}/octave/statdefs.h @@ -593,44 +600,21 @@ 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}/__gnuplot_init__.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/__gnuplot_plot__.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/__gnuplot_raw__.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/__gnuplot_replot__.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/__gnuplot_set__.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/__gnuplot_show__.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/__gnuplot_splot__.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/__qp__.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/airy.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/balance.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/besselh.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/besseli.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/besselj.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/besselk.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/bessely.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/betainc.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/builtin.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}/chol2inv.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/cholinv.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/clearplot.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/closeplot.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}/daspk_options.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/dasrt.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/dasrt_options.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/dassl.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/dassl_options.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}/dispatch_help.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/eig.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/endgrent.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/endpwent.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/etree.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 @@ -639,83 +623,38 @@ 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}/fsolve_options.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/full.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}/getgrgid.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/getgrnam.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/getpwent.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/getpwnam.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/getpwuid.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}/gmtime.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/gplot.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/graw.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/gset.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/gshow.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/gsplot.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/hess.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/hold.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/ifft.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/ifft2.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/ifftn.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/inv.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/inverse.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/ishold.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/issparse.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/kron.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/localtime.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/lpsolve.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/lpsolve_options.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/lsode.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/lsode_options.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}/max.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/min.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/minmax.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/mktime.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/nnz.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/nzmax.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/pinv.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/purge_tmp_files.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}/quad_options.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}/randn.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/schur.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/setgrent.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/setpwent.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}/spatan2.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spcumprod.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spcumsum.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}/spdiag.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spfind.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spinv.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}/spmax.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spmin.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spparms.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spprod.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spsum.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spsumsq.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/sqrtm.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/strftime.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/strptime.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}/symamd.oct -libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/symbfact.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/time.oct libexec/octave/ls-R man/man1/mkoctfile.1 @@ -726,7 +665,6 @@ share/doc/html/octave/Octave-FAQ_1.html share/doc/html/octave/Octave-FAQ_10.html share/doc/html/octave/Octave-FAQ_11.html share/doc/html/octave/Octave-FAQ_12.html -share/doc/html/octave/Octave-FAQ_13.html share/doc/html/octave/Octave-FAQ_2.html share/doc/html/octave/Octave-FAQ_3.html share/doc/html/octave/Octave-FAQ_4.html @@ -735,9 +673,7 @@ 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_abt.html -share/doc/html/octave/Octave-FAQ_fot.html -share/doc/html/octave/Octave-FAQ_ovr.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 @@ -749,12 +685,7 @@ 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_19.html share/doc/html/octave/liboctave_2.html -share/doc/html/octave/liboctave_20.html -share/doc/html/octave/liboctave_21.html -share/doc/html/octave/liboctave_22.html -share/doc/html/octave/liboctave_23.html share/doc/html/octave/liboctave_3.html share/doc/html/octave/liboctave_4.html share/doc/html/octave/liboctave_5.html @@ -762,8 +693,6 @@ 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_abt.html -share/doc/html/octave/liboctave_ovr.html share/doc/html/octave/liboctave_toc.html share/doc/html/octave/octave_1.html share/doc/html/octave/octave_10.html @@ -822,6 +751,7 @@ 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 @@ -994,7 +924,39 @@ share/octave/${PKGVERSION}/m/control/util/zgrownorm.m share/octave/${PKGVERSION}/m/control/util/zgscal.m share/octave/${PKGVERSION}/m/control/util/zgsgiv.m share/octave/${PKGVERSION}/m/control/util/zgshsr.m +share/octave/${PKGVERSION}/m/deprecated/beta_cdf.m +share/octave/${PKGVERSION}/m/deprecated/beta_inv.m +share/octave/${PKGVERSION}/m/deprecated/beta_pdf.m +share/octave/${PKGVERSION}/m/deprecated/beta_rnd.m +share/octave/${PKGVERSION}/m/deprecated/binomial_cdf.m +share/octave/${PKGVERSION}/m/deprecated/binomial_inv.m +share/octave/${PKGVERSION}/m/deprecated/binomial_pdf.m +share/octave/${PKGVERSION}/m/deprecated/binomial_rnd.m +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/com2str.m +share/octave/${PKGVERSION}/m/deprecated/exponential_cdf.m +share/octave/${PKGVERSION}/m/deprecated/exponential_inv.m +share/octave/${PKGVERSION}/m/deprecated/exponential_pdf.m +share/octave/${PKGVERSION}/m/deprecated/exponential_rnd.m +share/octave/${PKGVERSION}/m/deprecated/f_cdf.m +share/octave/${PKGVERSION}/m/deprecated/f_inv.m +share/octave/${PKGVERSION}/m/deprecated/f_pdf.m +share/octave/${PKGVERSION}/m/deprecated/f_rnd.m +share/octave/${PKGVERSION}/m/deprecated/gamma_cdf.m +share/octave/${PKGVERSION}/m/deprecated/gamma_inv.m +share/octave/${PKGVERSION}/m/deprecated/gamma_pdf.m +share/octave/${PKGVERSION}/m/deprecated/gamma_rnd.m +share/octave/${PKGVERSION}/m/deprecated/geometric_cdf.m +share/octave/${PKGVERSION}/m/deprecated/geometric_inv.m +share/octave/${PKGVERSION}/m/deprecated/geometric_pdf.m +share/octave/${PKGVERSION}/m/deprecated/geometric_rnd.m +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/is_bool.m share/octave/${PKGVERSION}/m/deprecated/is_complex.m share/octave/${PKGVERSION}/m/deprecated/is_global.m @@ -1007,9 +969,34 @@ share/octave/${PKGVERSION}/m/deprecated/is_struct.m share/octave/${PKGVERSION}/m/deprecated/is_symmetric.m share/octave/${PKGVERSION}/m/deprecated/is_vector.m share/octave/${PKGVERSION}/m/deprecated/isstr.m +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/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/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/setstr.m share/octave/${PKGVERSION}/m/deprecated/struct_contains.m share/octave/${PKGVERSION}/m/deprecated/struct_elements.m +share/octave/${PKGVERSION}/m/deprecated/t_cdf.m +share/octave/${PKGVERSION}/m/deprecated/t_inv.m +share/octave/${PKGVERSION}/m/deprecated/t_pdf.m +share/octave/${PKGVERSION}/m/deprecated/t_rnd.m +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/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/acot.m share/octave/${PKGVERSION}/m/elfun/acoth.m share/octave/${PKGVERSION}/m/elfun/acsc.m @@ -1139,6 +1126,7 @@ 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/semicolon.m +share/octave/${PKGVERSION}/m/miscellaneous/single.m share/octave/${PKGVERSION}/m/miscellaneous/tempdir.m share/octave/${PKGVERSION}/m/miscellaneous/tempname.m share/octave/${PKGVERSION}/m/miscellaneous/texas_lotto.m @@ -1155,6 +1143,7 @@ share/octave/${PKGVERSION}/m/plot/PKG_ADD share/octave/${PKGVERSION}/m/plot/__axis_label__.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/__plr1__.m share/octave/${PKGVERSION}/m/plot/__plr2__.m share/octave/${PKGVERSION}/m/plot/__plr__.m @@ -1168,6 +1157,7 @@ share/octave/${PKGVERSION}/m/plot/__plt2vv__.m share/octave/${PKGVERSION}/m/plot/__plt__.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/axis.m share/octave/${PKGVERSION}/m/plot/bar.m share/octave/${PKGVERSION}/m/plot/bottom_title.m @@ -1178,6 +1168,8 @@ share/octave/${PKGVERSION}/m/plot/errorbar.m share/octave/${PKGVERSION}/m/plot/figure.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/ishold.m share/octave/${PKGVERSION}/m/plot/loglog.m share/octave/${PKGVERSION}/m/plot/loglogerr.m share/octave/${PKGVERSION}/m/plot/mesh.m @@ -1186,9 +1178,11 @@ 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/orient.m share/octave/${PKGVERSION}/m/plot/plot.m share/octave/${PKGVERSION}/m/plot/plot_border.m share/octave/${PKGVERSION}/m/plot/polar.m +share/octave/${PKGVERSION}/m/plot/print.m share/octave/${PKGVERSION}/m/plot/replot.m share/octave/${PKGVERSION}/m/plot/semilogx.m share/octave/${PKGVERSION}/m/plot/semilogxerr.m @@ -1330,25 +1324,26 @@ 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 -share/octave/${PKGVERSION}/m/statistics/distributions/beta_cdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/beta_inv.m -share/octave/${PKGVERSION}/m/statistics/distributions/beta_pdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/beta_rnd.m -share/octave/${PKGVERSION}/m/statistics/distributions/binomial_cdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/binomial_inv.m -share/octave/${PKGVERSION}/m/statistics/distributions/binomial_pdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/binomial_rnd.m +share/octave/${PKGVERSION}/m/statistics/distributions/betacdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/betainv.m +share/octave/${PKGVERSION}/m/statistics/distributions/betapdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/betarnd.m +share/octave/${PKGVERSION}/m/statistics/distributions/binocdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/binoinv.m +share/octave/${PKGVERSION}/m/statistics/distributions/binopdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/binornd.m share/octave/${PKGVERSION}/m/statistics/distributions/cauchy_cdf.m share/octave/${PKGVERSION}/m/statistics/distributions/cauchy_inv.m share/octave/${PKGVERSION}/m/statistics/distributions/cauchy_pdf.m share/octave/${PKGVERSION}/m/statistics/distributions/cauchy_rnd.m -share/octave/${PKGVERSION}/m/statistics/distributions/chisquare_cdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/chisquare_inv.m -share/octave/${PKGVERSION}/m/statistics/distributions/chisquare_pdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/chisquare_rnd.m +share/octave/${PKGVERSION}/m/statistics/distributions/chi2cdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/chi2inv.m +share/octave/${PKGVERSION}/m/statistics/distributions/chi2pdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/chi2rnd.m share/octave/${PKGVERSION}/m/statistics/distributions/discrete_cdf.m share/octave/${PKGVERSION}/m/statistics/distributions/discrete_inv.m share/octave/${PKGVERSION}/m/statistics/distributions/discrete_pdf.m @@ -1357,26 +1352,26 @@ share/octave/${PKGVERSION}/m/statistics/distributions/empirical_cdf.m share/octave/${PKGVERSION}/m/statistics/distributions/empirical_inv.m share/octave/${PKGVERSION}/m/statistics/distributions/empirical_pdf.m share/octave/${PKGVERSION}/m/statistics/distributions/empirical_rnd.m -share/octave/${PKGVERSION}/m/statistics/distributions/exponential_cdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/exponential_inv.m -share/octave/${PKGVERSION}/m/statistics/distributions/exponential_pdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/exponential_rnd.m -share/octave/${PKGVERSION}/m/statistics/distributions/f_cdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/f_inv.m -share/octave/${PKGVERSION}/m/statistics/distributions/f_pdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/f_rnd.m -share/octave/${PKGVERSION}/m/statistics/distributions/gamma_cdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/gamma_inv.m -share/octave/${PKGVERSION}/m/statistics/distributions/gamma_pdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/gamma_rnd.m -share/octave/${PKGVERSION}/m/statistics/distributions/geometric_cdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/geometric_inv.m -share/octave/${PKGVERSION}/m/statistics/distributions/geometric_pdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/geometric_rnd.m -share/octave/${PKGVERSION}/m/statistics/distributions/hypergeometric_cdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/hypergeometric_inv.m -share/octave/${PKGVERSION}/m/statistics/distributions/hypergeometric_pdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/hypergeometric_rnd.m +share/octave/${PKGVERSION}/m/statistics/distributions/expcdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/expinv.m +share/octave/${PKGVERSION}/m/statistics/distributions/exppdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/exprnd.m +share/octave/${PKGVERSION}/m/statistics/distributions/fcdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/finv.m +share/octave/${PKGVERSION}/m/statistics/distributions/fpdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/frnd.m +share/octave/${PKGVERSION}/m/statistics/distributions/gamcdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/gaminv.m +share/octave/${PKGVERSION}/m/statistics/distributions/gampdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/gamrnd.m +share/octave/${PKGVERSION}/m/statistics/distributions/geocdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/geoinv.m +share/octave/${PKGVERSION}/m/statistics/distributions/geopdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/geornd.m +share/octave/${PKGVERSION}/m/statistics/distributions/hygecdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/hygeinv.m +share/octave/${PKGVERSION}/m/statistics/distributions/hygepdf.m +share/octave/${PKGVERSION}/m/statistics/distributions/hygernd.m share/octave/${PKGVERSION}/m/statistics/distributions/kolmogorov_smirnov_cdf.m share/octave/${PKGVERSION}/m/statistics/distributions/laplace_cdf.m share/octave/${PKGVERSION}/m/statistics/distributions/laplace_inv.m @@ -1386,39 +1381,39 @@ share/octave/${PKGVERSION}/m/statistics/distributions/logistic_cdf.m share/octave/${PKGVERSION}/m/statistics/distributions/logistic_inv.m share/octave/${PKGVERSION}/m/statistics/distributions/logistic_pdf.m share/octave/${PKGVERSION}/m/statistics/distributions/logistic_rnd.m -share/octave/${PKGVERSION}/m/statistics/distributions/lognormal_cdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/lognormal_inv.m -share/octave/${PKGVERSION}/m/statistics/distributions/lognormal_pdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/lognormal_rnd.m -share/octave/${PKGVERSION}/m/statistics/distributions/normal_cdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/normal_inv.m -share/octave/${PKGVERSION}/m/statistics/distributions/normal_pdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/normal_rnd.m +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/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/poisson_cdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/poisson_inv.m -share/octave/${PKGVERSION}/m/statistics/distributions/poisson_pdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/poisson_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 +share/octave/${PKGVERSION}/m/statistics/distributions/poissrnd.m share/octave/${PKGVERSION}/m/statistics/distributions/stdnormal_cdf.m share/octave/${PKGVERSION}/m/statistics/distributions/stdnormal_inv.m share/octave/${PKGVERSION}/m/statistics/distributions/stdnormal_pdf.m share/octave/${PKGVERSION}/m/statistics/distributions/stdnormal_rnd.m -share/octave/${PKGVERSION}/m/statistics/distributions/t_cdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/t_inv.m -share/octave/${PKGVERSION}/m/statistics/distributions/t_pdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/t_rnd.m -share/octave/${PKGVERSION}/m/statistics/distributions/uniform_cdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/uniform_inv.m -share/octave/${PKGVERSION}/m/statistics/distributions/uniform_pdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/uniform_rnd.m -share/octave/${PKGVERSION}/m/statistics/distributions/weibull_cdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/weibull_inv.m -share/octave/${PKGVERSION}/m/statistics/distributions/weibull_pdf.m -share/octave/${PKGVERSION}/m/statistics/distributions/weibull_rnd.m -share/octave/${PKGVERSION}/m/statistics/distributions/wiener_rnd.m +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/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/wienrnd.m share/octave/${PKGVERSION}/m/statistics/models/logistic_regression.m share/octave/${PKGVERSION}/m/statistics/models/logistic_regression_derivatives.m share/octave/${PKGVERSION}/m/statistics/models/logistic_regression_likelihood.m @@ -1465,10 +1460,10 @@ share/octave/${PKGVERSION}/m/strings/str2double.m share/octave/${PKGVERSION}/m/strings/str2mat.m share/octave/${PKGVERSION}/m/strings/str2num.m share/octave/${PKGVERSION}/m/strings/strcat.m -share/octave/${PKGVERSION}/m/strings/strcmp.m share/octave/${PKGVERSION}/m/strings/strcmpi.m share/octave/${PKGVERSION}/m/strings/strjust.m share/octave/${PKGVERSION}/m/strings/strmatch.m +share/octave/${PKGVERSION}/m/strings/strncmp.m share/octave/${PKGVERSION}/m/strings/strrep.m share/octave/${PKGVERSION}/m/strings/substr.m share/octave/${PKGVERSION}/m/strings/upper.m @@ -1479,8 +1474,8 @@ share/octave/${PKGVERSION}/m/time/date.m share/octave/ls-R share/octave/site/m/startup/octaverc @dirrm share/octave/site/m/startup -@dirrm share/octave/site/api-v16/m -@dirrm share/octave/site/api-v16 +@dirrm share/octave/site/api-v17/m +@dirrm share/octave/site/api-v17 @dirrm share/octave/${PKGVERSION}/site/m @dirrm share/octave/${PKGVERSION}/site @dirrm share/octave/${PKGVERSION}/m/time @@ -1520,8 +1515,8 @@ share/octave/site/m/startup/octaverc @dirrm share/octave/${PKGVERSION}/doc @dirrm share/octave/${PKGVERSION} @dirrm share/doc/html/octave -@dirrm libexec/octave/site/oct/api-v16/${GNU_PLATFORM_DIR} -@dirrm libexec/octave/site/oct/api-v16 +@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} diff --git a/math/octave-current/buildlink3.mk b/math/octave-current/buildlink3.mk index 61c0faa4857..d5a4bee52d9 100644 --- a/math/octave-current/buildlink3.mk +++ b/math/octave-current/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2005/05/21 16:29:31 kristerw Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2006/01/06 22:41:48 adam Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -26,6 +26,7 @@ BUILDLINK_PKGSRCDIR.octave-current?= ../../math/octave-current .include "../../audio/libsndfile/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" .include "../../math/blas/buildlink3.mk" .include "../../math/fftw/buildlink3.mk" .include "../../math/lapack/buildlink3.mk" diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo index 9999a48f7d0..5874207e03b 100644 --- a/math/octave-current/distinfo +++ b/math/octave-current/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.34 2005/12/18 19:07:00 joerg Exp $ +$NetBSD: distinfo,v 1.35 2006/01/06 22:41:48 adam Exp $ -SHA1 (octave-2.9.3.tar.bz2) = be8a478650943250f0ef65521ddac025c29f0d75 -RMD160 (octave-2.9.3.tar.bz2) = 6b0c922efaa534485f1607f1979c90839394b21d -Size (octave-2.9.3.tar.bz2) = 6213159 bytes -SHA1 (patch-aa) = 34994a9e366675dfaf8aca3ced4fc662504e81c8 +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) = 16ec66a68e5ed80064d811cd1c8dda226a2f5ede +SHA1 (patch-ac) = 23046877d552df47d7cfaa1acce7c8c1f015f5c0 SHA1 (patch-ad) = 01d0fb5878897a91d33e2cb7cbc6d2575a04c464 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111 -SHA1 (patch-af) = 265a320a349818412b7c469039bf9847fbaf687e -SHA1 (patch-ag) = 67051eca55eb068ab6fb7d66d2c62ad7911bdcee +SHA1 (patch-af) = 08b20ca1a8291405368a2c0dc8509173b8f46f95 +SHA1 (patch-ag) = e252ff405bbad41a564595eda782fd724de1ff19 SHA1 (patch-ah) = f0f1989b0f6979f4978d7f6130b1d8d0776c1580 diff --git a/math/octave-current/octave.mk b/math/octave-current/octave.mk index 2e623babc5f..449af13f75c 100644 --- a/math/octave-current/octave.mk +++ b/math/octave-current/octave.mk @@ -1,4 +1,4 @@ -# $NetBSD: octave.mk,v 1.4 2005/12/05 20:50:37 rillig Exp $ +# $NetBSD: octave.mk,v 1.5 2006/01/06 22:41:48 adam Exp $ .include "../../mk/bsd.prefs.mk" @@ -11,9 +11,9 @@ OCTAVE_VARS?= LOCALVERFCNFILEDIR LOCALVEROCTFILEDIR LOCALVERARCHLIBDIR VERSION # Set OCT_<var> to the value of <var> as returned by octave-config. .if !empty(PHASES_AFTER_EXTRACT:M${PKG_PHASE}) . if exists(${OCTAVE_CONFIG}) -. for _var_ in ${OCTAVE_VARS} -. if !defined(OCT_${_var_}) -OCT_${_var_}!= ${OCTAVE_CONFIG} -p ${_var_} +. for var in ${OCTAVE_VARS} +. if !defined(OCT_${var}) +OCT_${var}!= ${OCTAVE_CONFIG} -p ${var} . endif . endfor . endif diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa index faa4c0cbfd4..fd42d3b39d3 100644 --- a/math/octave-current/patches/patch-aa +++ b/math/octave-current/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.15 2005/07/01 16:11:05 adam Exp $ +$NetBSD: patch-aa,v 1.16 2006/01/06 22:41:48 adam Exp $ ---- configure.orig 2005-05-18 14:02:46.000000000 +0000 +--- configure.orig 2005-11-11 20:57:06.000000000 +0100 +++ configure -@@ -10526,7 +10526,7 @@ if $have_fortran_compiler; then +@@ -10554,7 +10554,7 @@ if $have_fortran_compiler; then %.c : %.f %.o : %.f @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.15 2005/07/01 16:11:05 adam Exp $ pic/%.o : %.f $(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@ -@@ -13234,7 +13234,7 @@ TEMPLATE_AR='$(AR)' +@@ -14680,7 +14680,7 @@ TEMPLATE_AR='$(AR)' TEMPLATE_ARFLAGS="$ARFLAGS" library_path_var=LD_LIBRARY_PATH case "$canonical_host_type" in @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.15 2005/07/01 16:11:05 adam Exp $ SH_LD=ld SH_LDFLAGS=-Bshareable ;; -@@ -22687,19 +22687,19 @@ case "$canonical_host_type" in +@@ -24838,19 +24838,19 @@ case "$canonical_host_type" in cat << \EOF > $bsd_gcc_kluge_targets_frag lex.o: lex.cc @@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.15 2005/07/01 16:11:05 adam Exp $ EOF ;; -@@ -22827,9 +22827,9 @@ then +@@ -24978,9 +24978,9 @@ then rm -rf "$tmp" fi diff --git a/math/octave-current/patches/patch-ac b/math/octave-current/patches/patch-ac index bdef180943c..198102be793 100644 --- a/math/octave-current/patches/patch-ac +++ b/math/octave-current/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.6 2005/04/27 14:31:05 adam Exp $ +$NetBSD: patch-ac,v 1.7 2006/01/06 22:41:48 adam Exp $ ---- Makeconf.in.orig 2005-04-21 14:55:16.000000000 +0000 +--- Makeconf.in.orig 2005-11-11 20:47:12.000000000 +0100 +++ Makeconf.in -@@ -73,7 +73,7 @@ SHLBIN = @SHLBIN@ +@@ -78,7 +78,7 @@ SHLBIN = @SHLBIN@ SHLBIN_VER = @SHLBIN_VER@ SHLLINKEXT= @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.6 2005/04/27 14:31:05 adam Exp $ # Fortran to C translator and associated flags. -@@ -165,7 +165,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@ +@@ -171,7 +171,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@ SH_LD = @SH_LD@ SH_LDFLAGS = @SH_LDFLAGS@ @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.6 2005/04/27 14:31:05 adam Exp $ DL_LDFLAGS = @DL_LDFLAGS@ SONAME_FLAGS = @SONAME_FLAGS@ -@@ -347,10 +347,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@ +@@ -361,10 +361,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@ # How to make .o files: %.o : %.c diff --git a/math/octave-current/patches/patch-af b/math/octave-current/patches/patch-af index c3494871b3f..81c48f98c6b 100644 --- a/math/octave-current/patches/patch-af +++ b/math/octave-current/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.10 2005/04/27 14:31:05 adam Exp $ +$NetBSD: patch-af,v 1.11 2006/01/06 22:41:48 adam Exp $ ---- liboctave/Makefile.in.orig 2005-04-21 16:18:17.000000000 +0000 +--- liboctave/Makefile.in.orig 2005-11-11 20:47:23.000000000 +0100 +++ liboctave/Makefile.in -@@ -229,8 +229,9 @@ endif +@@ -225,8 +225,9 @@ endif liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS) rm -f $@ @@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.10 2005/04/27 14:31:05 adam Exp $ liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT) rm -f $@ -@@ -257,9 +258,8 @@ install-lib: +@@ -253,9 +254,8 @@ install-lib: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) if $(STATIC_LIBS); then \ rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \ diff --git a/math/octave-current/patches/patch-ag b/math/octave-current/patches/patch-ag index 7a2be6e66b3..081ea44e0c8 100644 --- a/math/octave-current/patches/patch-ag +++ b/math/octave-current/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.14 2005/07/01 16:11:05 adam Exp $ +$NetBSD: patch-ag,v 1.15 2006/01/06 22:41:48 adam Exp $ ---- src/Makefile.in.orig 2005-05-18 12:20:51.000000000 +0000 +--- src/Makefile.in.orig 2005-11-11 20:48:04.000000000 +0100 +++ src/Makefile.in -@@ -287,8 +287,9 @@ libraries: $(LIBRARIES) +@@ -291,8 +291,9 @@ libraries: $(LIBRARIES) liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA) rm -f $@ @@ -14,16 +14,14 @@ $NetBSD: patch-ag,v 1.14 2005/07/01 16:11:05 adam Exp $ liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT) rm -f $@ -@@ -296,7 +297,7 @@ liboctinterp.$(SHLEXT_VER): liboctinterp +@@ -300,12 +301,13 @@ liboctinterp.$(SHLEXT_VER): liboctinterp liboctinterp.$(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-oct-links: $(OCT_FILES) - if [ -n "$(OCT_FILES)" ]; then \ -@@ -308,6 +309,7 @@ stamp-prereq: defaults.h oct-conf.h oct- + stamp-prereq: defaults.h oct-conf.h oct-gperf.h parse.cc lex.cc gplot.cc $(OPT_HANDLERS) touch stamp-prereq octave$(EXEEXT): stamp-prereq $(LIBRARIES) main.o $(DLD_STATIC_OBJ) @@ -31,23 +29,27 @@ $NetBSD: patch-ag,v 1.14 2005/07/01 16:11:05 adam Exp $ $(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \ $(ALL_LDFLAGS) -o $@ \ main.o $(DLD_STATIC_OBJ) \ -@@ -394,6 +396,7 @@ install-strip: +@@ -392,6 +394,7 @@ install-strip: install-bin: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT) + ${LIBTOOL} --mode=install \ $(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT) - $(LN_S) octave-$(version)$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT) + cd $(DESTDIR)$(bindir) ; $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT) .PHONY: install-bin -@@ -404,6 +407,7 @@ install-oct: PKG_ADD +@@ -401,9 +404,10 @@ 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-oct-links $(DESTDIR)$(octfiledir) $(DLD_DEF_FILES); \ -@@ -414,9 +418,8 @@ install-lib: +- $(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: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) if $(STATIC_LIBS); then \ rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \ |