pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/octave-current Changes 2.9.1:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/32e0741004cd
branches:  trunk
changeset: 491925:32e0741004cd
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Apr 01 10:15:19 2005 +0000

description:
Changes 2.9.1:
* use glpk
* improvements

diffstat:

 math/octave-current/Makefile         |   34 +++++----
 math/octave-current/PLIST            |  125 +++++++++++++++++++++++++++++++++-
 math/octave-current/distinfo         |   18 ++--
 math/octave-current/octave.mk        |    6 +-
 math/octave-current/options.mk       |   19 +++++
 math/octave-current/patches/patch-aa |   10 +-
 math/octave-current/patches/patch-ac |   17 +++-
 math/octave-current/patches/patch-ad |   10 +-
 math/octave-current/patches/patch-af |   10 +-
 math/octave-current/patches/patch-ag |   33 ++------
 10 files changed, 205 insertions(+), 77 deletions(-)

diffs (truncated from 733 to 300 lines):

diff -r 6c53c571bd57 -r 32e0741004cd math/octave-current/Makefile
--- a/math/octave-current/Makefile      Fri Apr 01 08:59:12 2005 +0000
+++ b/math/octave-current/Makefile      Fri Apr 01 10:15:19 2005 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.44 2005/03/22 09:24:29 adam Exp $
+# $NetBSD: Makefile,v 1.45 2005/04/01 10:15:19 adam Exp $
 
 DISTNAME=      octave-${OCTAVE_VER}
 PKGNAME=       octave-current-${OCTAVE_VER}
 CATEGORIES=    math
-MASTER_SITES=  ftp://ftp.che.wisc.edu/pub/octave/ \
-               ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/ \
-               ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/ \
-               ftp://ftp.task.gda.pl/pub/software/octave/
+MASTER_SITES=  ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \
+               ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/ \
+               ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/bleeding-edge/ \
+               ftp://ftp.task.gda.pl/pub/software/octave/bleeding-edge/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    adam%NetBSD.org@localhost
@@ -17,8 +17,8 @@
 BUILD_DEPENDS+=        gperf>=2.7:../../devel/gperf
 DEPENDS+=      gnuplot>=3.7:../../graphics/gnuplot
 
-OCTAVE_VER=    2.1.67
-CONFLICTS+=    octave-2.0.*
+OCTAVE_VER=    2.9.1
+CONFLICTS+=    octave-2.*
 
 .if (${MACHINE_ARCH} == "arm32")
 BROKEN=                Internal compiler error occurs on arm32 (even with gcc-2.95.3)
@@ -36,9 +36,13 @@
 USE_LANGUAGES=         c c++ fortran
 
 # needed for loading of shared objects such as those in the
-# octave-forge package or user written ones compiled with
-# mkoctfile
+# octave-forge package or user written ones compiled with mkoctfile
 CONFIGURE_ARGS+=       --enable-dl
+# shared libraries are handled automatically in pkgsrc
+CONFIGURE_ARGS+=       --enable-static
+CONFIGURE_ARGS+=       --disable-shared
+
+.include "options.mk"
 
 INFO_FILES=    octave.info liboctave.info
 LIBOCTAVE_INFO=        liboctave.info liboctave.info-1 \
@@ -56,14 +60,12 @@
        ${MKDIR} ${WRKSRC}/src/pic
 
 # substitute in the real path to various bits of the toolchain because
-# mkoctfile will be used potentially by users and it needs to point
-# at the same compilers as were used in building octave.  We also
-# fix up the path to sed otherwise we end up with the buildlink directory
-# in mkoctfile
+# mkoctfile will be used potentially by users and it needs to point at the same
+# compilers as were used in building octave.  We also fix up the path to sed
+# otherwise we end up with the buildlink directory in mkoctfile
 post-build:
        ${MV} ${WRKSRC}/mkoctfile ${WRKSRC}/mkoctfile.bak
-       ${SED} \
-               -e 's;"${CC}";"${CCPATH}";g' \
+       ${SED}  -e 's;"${CC}";"${CCPATH}";g' \
                -e 's;"${CXX}";"${CXXPATH}";g' \
                -e 's;"${FC}";"${FCPATH}";g' \
                -e 's@^:[ \t]*\$${SED=.*@: \$$\{SED="${SED}"\}@g' \
@@ -84,8 +86,8 @@
 .endfor
 
 .include "../../audio/libsndfile/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../math/blas/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../math/lapack/buildlink3.mk"
diff -r 6c53c571bd57 -r 32e0741004cd math/octave-current/PLIST
--- a/math/octave-current/PLIST Fri Apr 01 08:59:12 2005 +0000
+++ b/math/octave-current/PLIST Fri Apr 01 10:15:19 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/03/22 09:24:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2005/04/01 10:15:19 adam Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
@@ -22,6 +22,7 @@
 include/octave-${PKGVERSION}/octave/CMatrix.h
 include/octave-${PKGVERSION}/octave/CNDArray.h
 include/octave-${PKGVERSION}/octave/CRowVector.h
+include/octave-${PKGVERSION}/octave/CSparse.h
 include/octave-${PKGVERSION}/octave/Cell.h
 include/octave-${PKGVERSION}/octave/CmplxAEPBAL.h
 include/octave-${PKGVERSION}/octave/CmplxCHOL.h
@@ -61,6 +62,8 @@
 include/octave-${PKGVERSION}/octave/MArrayN.h
 include/octave-${PKGVERSION}/octave/MDiagArray2.cc
 include/octave-${PKGVERSION}/octave/MDiagArray2.h
+include/octave-${PKGVERSION}/octave/MSparse-defs.h
+include/octave-${PKGVERSION}/octave/MSparse.h
 include/octave-${PKGVERSION}/octave/Matrix.h
 include/octave-${PKGVERSION}/octave/NLConst.h
 include/octave-${PKGVERSION}/octave/NLEqn-opts.h
@@ -76,6 +79,11 @@
 include/octave-${PKGVERSION}/octave/Quad-opts.h
 include/octave-${PKGVERSION}/octave/Quad.h
 include/octave-${PKGVERSION}/octave/Range.h
+include/octave-${PKGVERSION}/octave/Sparse-op-defs.h
+include/octave-${PKGVERSION}/octave/Sparse.h
+include/octave-${PKGVERSION}/octave/SparseCmplxLU.h
+include/octave-${PKGVERSION}/octave/SparseType.h
+include/octave-${PKGVERSION}/octave/SparsedbleLU.h
 include/octave-${PKGVERSION}/octave/base-dae.h
 include/octave-${PKGVERSION}/octave/base-de.h
 include/octave-${PKGVERSION}/octave/base-list.h
@@ -84,6 +92,7 @@
 include/octave-${PKGVERSION}/octave/base-min.h
 include/octave-${PKGVERSION}/octave/boolMatrix.h
 include/octave-${PKGVERSION}/octave/boolNDArray.h
+include/octave-${PKGVERSION}/octave/boolSparse.h
 include/octave-${PKGVERSION}/octave/byte-swap.h
 include/octave-${PKGVERSION}/octave/c-file-ptr-stream.h
 include/octave-${PKGVERSION}/octave/chMatrix.h
@@ -97,6 +106,7 @@
 include/octave-${PKGVERSION}/octave/dMatrix.h
 include/octave-${PKGVERSION}/octave/dNDArray.h
 include/octave-${PKGVERSION}/octave/dRowVector.h
+include/octave-${PKGVERSION}/octave/dSparse.h
 include/octave-${PKGVERSION}/octave/data-conv.h
 include/octave-${PKGVERSION}/octave/dbleAEPBAL.h
 include/octave-${PKGVERSION}/octave/dbleCHOL.h
@@ -428,6 +438,7 @@
 include/octave-${PKGVERSION}/octave/oct-shlib.h
 include/octave-${PKGVERSION}/octave/oct-sort.cc
 include/octave-${PKGVERSION}/octave/oct-sort.h
+include/octave-${PKGVERSION}/octave/oct-spparms.h
 include/octave-${PKGVERSION}/octave/oct-stdstrm.h
 include/octave-${PKGVERSION}/octave/oct-stream.h
 include/octave-${PKGVERSION}/octave/oct-strstrm.h
@@ -442,8 +453,10 @@
 include/octave-${PKGVERSION}/octave/ov-base-mat.h
 include/octave-${PKGVERSION}/octave/ov-base-scalar.cc
 include/octave-${PKGVERSION}/octave/ov-base-scalar.h
+include/octave-${PKGVERSION}/octave/ov-base-sparse.h
 include/octave-${PKGVERSION}/octave/ov-base.h
 include/octave-${PKGVERSION}/octave/ov-bool-mat.h
+include/octave-${PKGVERSION}/octave/ov-bool-sparse.h
 include/octave-${PKGVERSION}/octave/ov-bool.h
 include/octave-${PKGVERSION}/octave/ov-builtin.h
 include/octave-${PKGVERSION}/octave/ov-cell.h
@@ -452,6 +465,7 @@
 include/octave-${PKGVERSION}/octave/ov-complex.h
 include/octave-${PKGVERSION}/octave/ov-cs-list.h
 include/octave-${PKGVERSION}/octave/ov-cx-mat.h
+include/octave-${PKGVERSION}/octave/ov-cx-sparse.h
 include/octave-${PKGVERSION}/octave/ov-dld-fcn.h
 include/octave-${PKGVERSION}/octave/ov-fcn-handle.h
 include/octave-${PKGVERSION}/octave/ov-fcn-inline.h
@@ -467,6 +481,7 @@
 include/octave-${PKGVERSION}/octave/ov-mapper.h
 include/octave-${PKGVERSION}/octave/ov-range.h
 include/octave-${PKGVERSION}/octave/ov-re-mat.h
+include/octave-${PKGVERSION}/octave/ov-re-sparse.h
 include/octave-${PKGVERSION}/octave/ov-scalar.h
 include/octave-${PKGVERSION}/octave/ov-str-mat.h
 include/octave-${PKGVERSION}/octave/ov-streamoff.h
@@ -507,7 +522,6 @@
 include/octave-${PKGVERSION}/octave/pt-loop.h
 include/octave-${PKGVERSION}/octave/pt-mat.h
 include/octave-${PKGVERSION}/octave/pt-misc.h
-include/octave-${PKGVERSION}/octave/pt-plot.h
 include/octave-${PKGVERSION}/octave/pt-pr-code.h
 include/octave-${PKGVERSION}/octave/pt-select.h
 include/octave-${PKGVERSION}/octave/pt-stmt.h
@@ -517,7 +531,28 @@
 include/octave-${PKGVERSION}/octave/quit.h
 include/octave-${PKGVERSION}/octave/sighandlers.h
 include/octave-${PKGVERSION}/octave/siglist.h
+include/octave-${PKGVERSION}/octave/smx-bm-sbm.h
+include/octave-${PKGVERSION}/octave/smx-cm-scm.h
+include/octave-${PKGVERSION}/octave/smx-cm-sm.h
+include/octave-${PKGVERSION}/octave/smx-cs-sm.h
+include/octave-${PKGVERSION}/octave/smx-m-scm.h
+include/octave-${PKGVERSION}/octave/smx-m-sm.h
+include/octave-${PKGVERSION}/octave/smx-s-scm.h
+include/octave-${PKGVERSION}/octave/smx-sbm-bm.h
+include/octave-${PKGVERSION}/octave/smx-scm-cm.h
+include/octave-${PKGVERSION}/octave/smx-scm-m.h
+include/octave-${PKGVERSION}/octave/smx-scm-s.h
+include/octave-${PKGVERSION}/octave/smx-scm-sm.h
+include/octave-${PKGVERSION}/octave/smx-sm-cm.h
+include/octave-${PKGVERSION}/octave/smx-sm-cs.h
+include/octave-${PKGVERSION}/octave/smx-sm-m.h
+include/octave-${PKGVERSION}/octave/smx-sm-scm.h
 include/octave-${PKGVERSION}/octave/so-array.h
+include/octave-${PKGVERSION}/octave/sparse-base-lu.cc
+include/octave-${PKGVERSION}/octave/sparse-base-lu.h
+include/octave-${PKGVERSION}/octave/sparse-sort.h
+include/octave-${PKGVERSION}/octave/sparse-xdiv.h
+include/octave-${PKGVERSION}/octave/sparse-xpow.h
 include/octave-${PKGVERSION}/octave/statdefs.h
 include/octave-${PKGVERSION}/octave/str-vec.h
 include/octave-${PKGVERSION}/octave/sun-utils.h
@@ -555,6 +590,15 @@
 lib/liboctinterp.la
 libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/info-emacs-info
 libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/info-emacs-octave-help
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/PKG_ADD
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__glpk__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_init__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_plot__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_raw__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_replot__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_set__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_show__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_splot__.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/airy.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/balance.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/besselh.oct
@@ -563,7 +607,12 @@
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/besselk.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/bessely.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/betainc.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/builtin.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/cellfun.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/chol.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/clearplot.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/closeplot.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/colamd.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/colloc.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/daspk.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/daspk_options.oct
@@ -572,9 +621,12 @@
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dassl.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dassl_options.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/det.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dispatch.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dispatch_help.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/eig.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/endgrent.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/endpwent.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/etree.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/expm.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fft.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fft2.oct
@@ -584,6 +636,7 @@
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/find.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fsolve.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fsolve_options.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/full.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gammainc.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gcd.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/getgrent.oct
@@ -595,12 +648,20 @@
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/getrusage.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/givens.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gmtime.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gplot.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/graw.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gset.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gshow.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gsplot.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/hess.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/hold.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/ifft.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/ifft2.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/ifftn.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/inv.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/inverse.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/ishold.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/issparse.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/kron.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/localtime.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/lpsolve.oct
@@ -612,7 +673,10 @@
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/min.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/minmax.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/mktime.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/nnz.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/nzmax.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/pinv.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/purge_tmp_files.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/qr.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/quad.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/quad_options.oct
@@ -623,11 +687,28 @@
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/setgrent.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/setpwent.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/sort.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/sparse.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spatan2.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spcumprod.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spcumsum.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spdet.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spdiag.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spfind.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spinv.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/splu.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spmax.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/spmin.oct



Home | Main Index | Thread Index | Old Index