[114034] trunk/dports
michaelld at macports.org
michaelld at macports.org
Wed Nov 27 08:20:17 PST 2013
Revision: 114034
https://trac.macports.org/changeset/114034
Author: michaelld at macports.org
Date: 2013-11-27 08:20:17 -0800 (Wed, 27 Nov 2013)
Log Message:
-----------
octave:
+ move octave-devel to octave;
+ set octave-devel as replaced_by octave;
+ fix all possible octave modules to work correctly under 10.8 and 10.9;
+ set remaining 3 octave modules as deprecated because they do not work with octave 3.6 or newer, and there is no easy means to address the errors.
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/octave-1.0.tcl
trunk/dports/math/octave/Portfile
trunk/dports/math/octave-ad/Portfile
trunk/dports/math/octave-ann/Portfile
trunk/dports/math/octave-arpack/Portfile
trunk/dports/math/octave-audio/Portfile
trunk/dports/math/octave-benchmark/Portfile
trunk/dports/math/octave-bim/Portfile
trunk/dports/math/octave-bioinfo/Portfile
trunk/dports/math/octave-civil-engineering/Portfile
trunk/dports/math/octave-combinatorics/Portfile
trunk/dports/math/octave-communications/Portfile
trunk/dports/math/octave-control/Portfile
trunk/dports/math/octave-data-smoothing/Portfile
trunk/dports/math/octave-database/Portfile
trunk/dports/math/octave-devel/Portfile
trunk/dports/math/octave-econometrics/Portfile
trunk/dports/math/octave-engine/Portfile
trunk/dports/math/octave-financial/Portfile
trunk/dports/math/octave-fpl/Portfile
trunk/dports/math/octave-ga/Portfile
trunk/dports/math/octave-general/Portfile
trunk/dports/math/octave-graceplot/Portfile
trunk/dports/math/octave-gsl/Portfile
trunk/dports/math/octave-ident/Portfile
trunk/dports/math/octave-image/Portfile
trunk/dports/math/octave-informationtheory/Portfile
trunk/dports/math/octave-integration/Portfile
trunk/dports/math/octave-io/Portfile
trunk/dports/math/octave-irsa/Portfile
trunk/dports/math/octave-java/Portfile
trunk/dports/math/octave-linear-algebra/Portfile
trunk/dports/math/octave-mapping/Portfile
trunk/dports/math/octave-miscellaneous/Portfile
trunk/dports/math/octave-missing-functions/Portfile
trunk/dports/math/octave-msh/Portfile
trunk/dports/math/octave-multicore/Portfile
trunk/dports/math/octave-nan/Portfile
trunk/dports/math/octave-nnet/Portfile
trunk/dports/math/octave-ocs/Portfile
trunk/dports/math/octave-octcdf/Portfile
trunk/dports/math/octave-odebvp/Portfile
trunk/dports/math/octave-odepkg/Portfile
trunk/dports/math/octave-optim/Portfile
trunk/dports/math/octave-optiminterp/Portfile
trunk/dports/math/octave-outliers/Portfile
trunk/dports/math/octave-parallel/Portfile
trunk/dports/math/octave-pdb/Portfile
trunk/dports/math/octave-physicalconstants/Portfile
trunk/dports/math/octave-plot/Portfile
trunk/dports/math/octave-pt_br/Portfile
trunk/dports/math/octave-secs1d/Portfile
trunk/dports/math/octave-signal/Portfile
trunk/dports/math/octave-sockets/Portfile
trunk/dports/math/octave-specfun/Portfile
trunk/dports/math/octave-special-matrix/Portfile
trunk/dports/math/octave-spline-gcvspl/Portfile
trunk/dports/math/octave-splines/Portfile
trunk/dports/math/octave-statistics/Portfile
trunk/dports/math/octave-strings/Portfile
trunk/dports/math/octave-struct/Portfile
trunk/dports/math/octave-symband/Portfile
trunk/dports/math/octave-tcl-octave/Portfile
trunk/dports/math/octave-time/Portfile
trunk/dports/math/octave-tsa/Portfile
trunk/dports/math/octave-vrml/Portfile
trunk/dports/math/octave-windows/Portfile
trunk/dports/math/octave-zenity/Portfile
Added Paths:
-----------
trunk/dports/math/octave/files/patch-configure.diff
trunk/dports/math/octave/files/patch-liboctave-eigs-base.cc.diff
trunk/dports/math/octave/files/patch-liboctave-regexp.h.diff
trunk/dports/math/octave/files/patch-src-display.cc.diff
trunk/dports/math/octave-ad/files/
trunk/dports/math/octave-ad/files/patch-src_ov-grad.cc.diff
trunk/dports/math/octave-java/files/
trunk/dports/math/octave-java/files/patch-src_configure.diff
trunk/dports/math/octave-linear-algebra/files/
trunk/dports/math/octave-linear-algebra/files/patch-src_Makefile.diff
trunk/dports/math/octave-miscellaneous/files/
trunk/dports/math/octave-miscellaneous/files/patch-src_partarray.cc.diff
trunk/dports/math/octave-msh/files/
trunk/dports/math/octave-msh/files/patch-src_Makefile.in.diff
trunk/dports/math/octave-nan/files/
trunk/dports/math/octave-nan/files/patch-src_Makefile.diff
trunk/dports/math/octave-nan/files/patch-src_xptopen.cpp.diff
trunk/dports/math/octave-octcdf/files/
trunk/dports/math/octave-octcdf/files/patch-src_configure.diff
trunk/dports/math/octave-parallel/files/
trunk/dports/math/octave-parallel/files/patch-add-unistd.h.diff
trunk/dports/math/octave-sockets/files/
trunk/dports/math/octave-sockets/files/patch-src_Makefile.diff
trunk/dports/math/octave-strings/files/
trunk/dports/math/octave-strings/files/patch-src_Makefile.diff
trunk/dports/math/octave-tsa/files/
trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff
Removed Paths:
-------------
trunk/dports/math/octave/files/patch-configure-no_x11.diff
trunk/dports/math/octave/files/patch-liboctave_oct-alloc.h.diff
trunk/dports/math/octave/files/patch-liboctave_oct-inttypes.h.diff
trunk/dports/math/octave/files/patch-lo-specfun.cc.diff
trunk/dports/math/octave/files/patch-src_pr-output.cc.diff
trunk/dports/math/octave/files/patch-urlwrite.cc.diff
trunk/dports/math/octave-database/files/
trunk/dports/math/octave-devel/files/
Modified: trunk/dports/_resources/port1.0/group/octave-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/octave-1.0.tcl 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/_resources/port1.0/group/octave-1.0.tcl 2013-11-27 16:20:17 UTC (rev 114034)
@@ -28,19 +28,17 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
+# This PortGroup automatically sets up the standard environment for
+# building an octave module.
#
-# This PortGroup automatically sets up the standard environment for building
-# an octave module.
-#
# Usage:
#
# PortGroup octave 1.0
# octave.setup module version
#
-# where module is the name of the module (e.g. communications) and version is
-# its version.
+# where module is the name of the module (e.g. communications) and
+# version is its version.
-
options octave.module
proc octave.setup {module version} {
@@ -56,23 +54,91 @@
depends_lib path:bin/octave:octave
+ worksrcdir ${octave.module}
+
# octave is not universal
+
universal_variant no
- use_configure no
+ # do not build in parallel; many can't, and these are small builds
+ # anyway, so no major need for this.
+
+ use_parallel_build no
+
+ configure.pre_args
+ configure.post_args
+
livecheck.type regex
livecheck.url http://octave.sourceforge.net/packages.php
livecheck.regex http://downloads\\.sourceforge\\.net/octave/${octave.module}-(\\d+(\\.\\d+)*)\\.tar
+
}
-extract {
- xinstall -d -m 755 ${worksrcpath}
+post-extract {
+
+ # rename the effective worksrcdir to always be ${octave.module}
+
+ set worksrcdir_name [exec /bin/ls ${workpath} | grep -v -E "^\\."]
+ if {[string equal ${worksrcdir_name} ${octave.module}] == 0} {
+ move ${workpath}/${worksrcdir_name} ${workpath}/${octave.module}
+ }
+
}
-build {
- system "${prefix}/bin/octave -q -f --eval 'pkg build -verbose -nodeps ${worksrcpath} ${distpath}/${distfiles}'"
+post-patch {
+ # In 10.8+, set the locale to "C" otherwise /usr/bin/sed can fail
+ # with an error when processing unicode characters.
+
+ set locale ""
+ platform darwin {
+ if {${os.major} >= 12} {
+ set locale "-locale \"C\""
+ }
+ }
+
+ # do not auto-load; like, ever. Not all files will need this, but
+ # it's a simple catch-all.
+
+ eval [subst {
+ reinplace ${locale} "/Autoload/s at yes@no at g" ${worksrcpath}/DESCRIPTION
+ }]
+
+ # create a tarball of the resulting patched module
+
+ xinstall -d -m 755 ${workpath}
+ system "cd ${workpath} && tar zcf .tmp/${octave.module}.tar.gz ${worksrcdir}"
+ delete ${worksrcpath}
}
+pre-configure {
+
+ # set parameters, now that variables are available for use
+
+ configure.cmd ${prefix}/bin/octave
+ configure.args -q -f --eval 'pkg build -verbose -nodeps ${worksrcpath} ${workpath}/.tmp/${octave.module}.tar.gz'
+
+ # fix usage of LAPACK_LIBS to include FLIBS, such that -lgfortran
+ # is always paired with the appropriate -Lpath statement.
+
+ configure.env-append \
+ LAPACK_LIBS='[exec ${prefix}/bin/mkoctfile -p FLIBS] [exec ${prefix}/bin/mkoctfile -p LAPACK_LIBS]'
+
+ platform darwin {
+ if {${os.major} >= 12} {
+
+ # In 10.8+, set the LC_CTYPE (locale) to "C" otherwise
+ # /usr/bin/sed can fail with an error when processing
+ # unicode characters.
+
+ configure.env-append LC_CTYPE="C"
+ }
+ }
+}
+
+# dummy build phase, since this has already been done
+
+build {}
+
destroot.keepdirs ${destroot}${prefix}/lib/octave/packages \
${destroot}${prefix}/share/octave/packages
@@ -86,7 +152,7 @@
}
post-deactivate {
- system "${prefix}/bin/octave -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg uninstall ${octave.module}'"
+ system "${prefix}/bin/octave -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg uninstall -nodeps ${octave.module}'"
system "${prefix}/bin/octave -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg rebuild'"
}
Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,16 +1,20 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
-PortSystem 1.0
+PortSystem 1.0
+PortGroup active_variants 1.1
+PortGroup compiler_blacklist_versions 1.0
name octave
-version 3.2.4
-revision 16
-conflicts octave-devel
+
+version 3.6.4
+revision 10
+#conflicts octave-devel
categories math science
-license GPL-3+
-maintainers nomaintainer
+maintainers michaelld openmaintainer
+license GPL-3
platforms darwin
+
description a Matlab-like environment for numerical analysis
long_description Octave provides a convenient command line interface \
for solving linear and nonlinear problems numerically, \
@@ -20,205 +24,325 @@
modules written in e.g. C++, C or Fortran.
homepage http://www.gnu.org/software/octave/
-master_sites gnu
+dist_subdir octave
+distname octave-${version}
+master_sites gnu:octave
+use_bzip2 yes
-checksums md5 90c39fa9e241ad2e978bcee4682a2ba9 \
- sha1 93b81fc300bc5e27e88b6668ef0622f29898dfd2 \
- rmd160 13b2198db1b8684229d2ba787ebbedd8e50a518c
+checksums \
+ rmd160 b0356f0c5d9366b8129d72ac58bbde837fee1a95 \
+ sha256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962
-depends_build port:gawk \
+# temporary patches; these are already, or will be, fixed upstream.
+
+patchfiles-append \
+ patch-liboctave-eigs-base.cc.diff \
+ patch-liboctave-regexp.h.diff \
+ patch-configure.diff
+
+if {${os.major} >= 11} {
+
+ # 10.7 and newer requires an extra patch; this patch will
+ # break the build on 10.6 and prior.
+
+ patchfiles-append patch-src-display.cc.diff
+
+}
+
+depends_build-append \
+ port:bison \
+ port:flex \
+ port:gperf \
path:bin/perl:perl5 \
- port:texinfo
+ port:pkgconfig
-depends_lib port:arpack \
+depends_lib-append \
+ path:lib/libgcc/libgcc_s.1.dylib:libgcc \
+ port:arpack \
port:curl \
port:fftw-3 \
port:fftw-3-single \
- port:ftgl \
- port:ghostscript \
+ port:gawk \
port:glpk \
+ port:gnuplot \
port:GraphicsMagick \
- port:gnuplot \
+ port:grep \
+ port:gsed \
port:hdf5-18 \
- port:metis \
+ port:less \
port:ncurses \
port:pcre \
- port:readline \
port:qhull \
port:qrupdate \
+ port:readline \
port:SuiteSparse \
- port:gsed
+ port:zlib
-# TODO: Fix build with clang
-#./DiagArray2.h:97:19: error: dependent using declaration resolved to type without 'typename'
-# using Array<T>::element_type;
-# ^
-#./MDiagArray2.h:42:22: note: in instantiation of template class 'DiagArray2<std::complex<double> >' requested here
-#MDiagArray2 : public DiagArray2<T>
-# ^
-#./CDiagMatrix.h:39:28: note: in instantiation of template class 'MDiagArray2<std::complex<double> >' requested here
-#ComplexDiagMatrix : public MDiagArray2<Complex>
-# ^
-#./Array.h:103:13: note: target of using declaration
-# typedef T element_type;
-# ^
-compiler.blacklist *clang*
+depends_run-append port:epstool \
+ port:ghostscript \
+ port:transfig \
+ port:pstoedit
-platform darwin {
- if {${os.major} >= 13} {
- # TODO: Test Mavericks once the clang build failures are addressed
+universal_variant no
- depends_lib
- depends_run
- pre-fetch {
- ui_error "$name does not build on Mavericks or later."
- error "unsupported platform"
- }
- }
-}
+# common configure arguments
-patchfiles \
- patch-configure-no_x11.diff \
- patch-liboctave_oct-alloc.h.diff \
- patch-liboctave_oct-inttypes.h.diff \
- patch-lo-specfun.cc.diff \
- patch-src_pr-output.cc.diff \
- patch-urlwrite.cc.diff
+configure.args \
+ --disable-dependency-tracking \
+ --with-umfpack="-lumfpack -lSuiteSparse"
-post-patch {
- reinplace "s|-lcholmod|-lcholmod -lmetis|g" ${worksrcpath}/configure
-}
+# octave uses a number of other ports to create sources from template:
+# perl, gawk, gsed, flex, bison, texinfo. Make sure these are the
+# MacPorts' versions. Python is not used if perl is available, so
+# clear it out. grep is checked for in 'configure', but not used
+# except inside that script; include it here for completion.
-configure.args --enable-shared \
- --enable-dl \
- --with-hdf5 \
- --with-fftw \
- --enable-static \
- --enable-readline \
- --with-zlib \
- --with-glpk \
- --with-curl \
- --with-lapack \
- --with-umfpack \
- --with-colamd \
- --with-ccolamd \
- --with-cholmod \
- --with-cxsparse \
- --without-framework-carbon
-
configure.perl ${prefix}/bin/perl
configure.python ' '
configure.awk ${prefix}/bin/gawk
-
-configure.env-append SED="${prefix}/bin/gsed" \
- MAKEINFO="${prefix}/bin/makeinfo" \
- TEXI2DVI="${prefix}/bin/texi2dvi" \
- TEXI2PDF="${prefix}/bin/texi2pdf"
-
+configure.env-append GREP="${prefix}/bin/grep" \
+ SED="${prefix}/bin/gsed" \
+ TEXI2DVI="${prefix}/bin/texi2dvi" \
+ TEXI2PDF="${prefix}/bin/texi2pdf"
configure.cppflags
+configure.ldflags
-post-configure {
- reinplace "s|UMFPACK_LIBS = -lumfpack|UMFPACK_LIBS = -lSuiteSparse -lumfpack|" ${worksrcpath}/Makeconf
- reinplace "s|-I${prefix}/include ||g" ${worksrcpath}/Makeconf
- reinplace "s|-I${prefix}/include$||g" ${worksrcpath}/Makeconf
-}
-
-use_parallel_build no
-universal_variant no
-
test.run yes
test.target check
-variant atlas conflicts accelerate description {use BLAS from ATLAS} {
- depends_lib-append port:atlas
-}
+# Block compilers: Some older versions of CLANG do not honor the CPATH
+# environment variables, which is required for compiling this port
+# when using MacPorts. The versions seem to be: MacPorts CLANG 2.9 or
+# earlier, and Apple CLANG 318.0.58 or older.
+#
+# See also < http://llvm.org/bugs/show_bug.cgi?id=8971 >
+# < https://trac.macports.org/ticket/40250 >.
-variant accelerate conflicts atlas description {use BLAS from Accelerate.framework} {
- if {![variant_isset g95]} {
- configure.fflags-append -ff2c
- }
- if {[variant_isset g95] || ([string match *64* $build_arch] && ${os.major} >= 10)} {
- depends_lib-append port:dotwrp
- configure.args-append --with-blas="-ldotwrp -framework Accelerate"
- }
- configure.args-append --with-lapack="-framework Accelerate"
-}
+compiler.blacklist-append { clang <= 318.0.61 } macports-clang-2.9
-if {[variant_isset g95]} {
- default_variants +accelerate
-} elseif {![variant_isset accelerate]} {
- default_variants +atlas
-}
-if {![variant_isset atlas] && ![variant_isset accelerate]} {
- pre-fetch {
- return -code error "You must use either the atlas or accelerate variant."
+platform darwin {
+ if {${os.major} >= 12} {
+
+ # In 10.8+, the LANG environment variable needs to be set to
+ # "C" otherwise /usr/bin/sed fails with an error. Ideally,
+ # octave's build system would honor the environment variable
+ # ${SED} throughout; reality is that it does not, so this
+ # addition is required because /usr/bin/sed will be used.
+
+ build.args-append LANG="C"
}
}
set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set default_fortran_variant +gcc48
-set g95_conflicts {}
+set gcc_default "4.8"
+# create g95 variant, with full conflicts of GCC versions
+
+set gcc_conflicts ""
foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
+ set gcc_ver_no_dot gcc[join [split ${ver} "."] ""]
+ set gcc_conflicts "${gcc_conflicts} ${gcc_ver_no_dot}"
+}
- set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
+eval [subst {
+ variant g95 conflicts ${gcc_conflicts} requires accelerate \
+ description "Build with MacPorts g95 as the Fortran Compiler" {
+ depends_build-append port:g95
+ configure.fc ${prefix}/bin/g95
+ configure.f77 ${prefix}/bin/g95
+ configure.f90 ${prefix}/bin/g95
+ }
+}]
- foreach over ${gcc_versions} {
- if {${ver} == ${over}} {
+# create GCC variants, with partial conflicts of other GCC versions
+
+foreach ver1 ${gcc_versions} {
+
+ set gcc_ver1_no_dot gcc[join [split ${ver1} "."] ""]
+
+ set gcc_conflicts "conflicts g95"
+ foreach ver2 ${gcc_versions} {
+ if {${ver1} eq ${ver2}} {
continue
}
-
- set over_no_dot [join [split ${over} "."] ""]
- append variant_line " conflicts gcc${over_no_dot}"
+ set gcc_ver2_no_dot gcc[join [split ${ver2} "."] ""]
+ set gcc_conflicts "${gcc_conflicts} ${gcc_ver2_no_dot}"
}
- append variant_line { {}}
- eval $variant_line
+ eval [subst {
+ variant ${gcc_ver1_no_dot} ${gcc_conflicts} \
+ description "Build with the MacPorts ${gcc_ver1_no_dot} as the Fortran Compiler" {
+ configure.fc ${prefix}/bin/gfortran-mp-${ver1}
+ configure.f77 ${prefix}/bin/gfortran-mp-${ver1}
+ configure.f90 ${prefix}/bin/gfortran-mp-${ver1}
+ }
+ }]
+}
- append g95_conflicts " conflicts gcc${ver_no_dot}"
+# check for setting the default variant
- if {[variant_isset gcc${ver_no_dot}]} {
- if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
- set default_fortran_variant ""
+set var_selection ""
+if {[variant_isset g95]} {
+ set var_selection "g95"
+} else {
+ foreach ver ${gcc_versions} {
+ set gcc_ver_no_dot gcc[join [split ${ver} "."] ""]
+ if {[variant_isset ${gcc_ver_no_dot}]} {
+ set var_selection "${gcc_ver_no_dot}"
}
}
}
-eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
+# check for need for default variant
+set gcc_default_no_dot gcc[join [split ${gcc_default} "."] ""]
+if {"${var_selection}" eq ""} {
+ default_variants +${gcc_default_no_dot}
+}
+
+# check if the user disabled just the default variant
+
+set var_selection ""
if {[variant_isset g95]} {
- if {${default_fortran_variant} != "+g95"} {
- set default_fortran_variant ""
+ set var_selection "g95"
+} else {
+ foreach ver ${gcc_versions} {
+ set gcc_ver_no_dot gcc[join [split ${ver} "."] ""]
+ if {[variant_isset ${gcc_ver_no_dot}]} {
+ set var_selection "${gcc_ver_no_dot}"
+ }
}
}
-if {${default_fortran_variant} != ""} {
- default_variants-append "${default_fortran_variant}"
+if {"${var_selection}" eq ""} {
+ ui_error "\n\nYou cannot use the -${gcc_default_no_dot} variant alone; a Fortran compiler is required.\n"
+ return -code error "Invalid variant selection"
}
-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
+# atlas does not work with g95, so always conflict with it
- if {[variant_isset gcc${ver_no_dot}]} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc${ver_no_dot}
+variant atlas description {use BLAS from MacPorts' atlas port} \
+ conflicts g95 accelerate {}
- configure.fc ${prefix}/bin/gfortran-mp-${ver}
- configure.f77 ${prefix}/bin/gfortran-mp-${ver}
- configure.f90 ${prefix}/bin/gfortran-mp-${ver}
+variant accelerate description \
+ {use BLAS from Apple's Accelerate.framework [might be buggy]} \
+ conflicts atlas {}
+
+if {![variant_isset accelerate] && ![variant_isset atlas]} {
+ default_variants +atlas
+}
+
+# make sure that either +accelerate or +atlas is selected
+
+if {![variant_isset accelerate] && ![variant_isset atlas]} {
+
+ ui_error "\n\nYou must select either the +accelerate or +atlas variant.\n"
+ return -code error "Invalid variant selection"
+
+}
+
+if {[variant_isset accelerate]} {
+
+ depends_lib-append port:dotwrp
+ configure.args-append \
+ --with-blas="-ldotwrp -Wl,-framework -Wl,Accelerate" \
+ --with-lapack="-Wl,-framework -Wl,Accelerate"
+
+} else {
+
+ depends_lib-append port:atlas
+ # NOTE: libtatlas does not work as of 3.10.1_5
+ configure.args-append \
+ --with-blas="-lcblas -lf77blas -latlas" \
+ --with-lapack="-llapack -lgfortran"
+
+}
+
+variant docs description {Enable creation and installation of \
+ documentation including manpages} {}
+
+if {[variant_isset docs]} {
+
+ depends_lib-append \
+ port:texinfo \
+ port:texlive-latex
+
+ configure.args-append --enable-docs
+
+} else {
+
+ configure.args-append --disable-docs
+
+}
+
+variant x11 description {Enable use of X11} {}
+
+if {[variant_isset x11]} {
+
+ configure.args-append --with-x --x-includes=${prefix}
+
+} else {
+
+ configure.args-append --without-x
+
+}
+
+variant fltk description {Enable FLTK as a graphical front-end} {}
+
+if {[variant_isset fltk]} {
+
+ depends_lib-append path:lib/libfltk.dylib:fltk \
+ port:fontconfig \
+ port:freetype
+ configure.args-append --with-opengl
+
+} else {
+
+ configure.args-append --without-opengl
+
+}
+
+variant metis description {Use SuiteSparse + Metis for graph partitioning} {
+ pre-fetch {
+ ui_msg "\nWARNING: ${name} variant +metis uses the metis port, whose license is incompatible with Octave's. You can use this combination locally, but you cannot distribute them as a single package (e.g., tarball, m/pkg, archive)."
}
}
-if {[variant_isset g95]} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:g95
+if {[variant_isset metis]} {
- configure.fc ${prefix}/bin/g95
- configure.f77 ${prefix}/bin/g95
- configure.f90 ${prefix}/bin/g95
+ depends_lib-append port:metis
+ configure.args-append --with-cholmod="-lcholmod -lmetis"
+
+ # make sure SuiteSparse is installed with +metis
+ require_active_variants SuiteSparse metis
+
+} else {
+
+ configure.args-append --with-cholmod="-lcholmod"
+
+ # make sure SuiteSparse is installed without +metis
+ require_active_variants SuiteSparse {} metis
+
}
+pre-fetch {
+
+ # check for +accelerate here as well as in dependent ports;
+ # Apple's VecLib has bugs that cause Octave to crash sometimes,
+ # while Atlas does not have these issues. Print a warning if this
+ # variant is in use, but do not force the use of +atlas (for now).
+
+ if {![catch {set result [active_variants arpack accelerate {}]}]} {
+ if {$result} {
+ ui_msg "\nWARNING: Dependency 'arpack' is installed with the +accelerate variant, using Apple's Vector Libraries which have known bugs that can cause Octave to crash if using certain functions in arpack. The +atlas variant does not have these issues with Octave, and is considered by Octave developers a better way to go.\n"
+ }
+ }
+
+ if {[variant_isset accelerate]} {
+ ui_msg "\nWARNING: The +accelerate variant has been selected, using Apple's Vector Libraries which have known bugs that can cause Octave to crash. The +atlas variant does not have these issues with Octave, and is considered by Octave developers a better way to go.\n"
+ }
+}
+
livecheck.type regex
-livecheck.url http://www.gnu.org/software/octave/news.html
-livecheck.regex Version (\\d+(\\.\\d+)*)
+livecheck.url http://www.gnu.org/software/octave/download.html
+livecheck.regex GNU Octave (\[\^\ \]*) was
Deleted: trunk/dports/math/octave/files/patch-configure-no_x11.diff
===================================================================
--- trunk/dports/math/octave/files/patch-configure-no_x11.diff 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave/files/patch-configure-no_x11.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,11 +0,0 @@
---- configure.orig 2010-01-19 06:47:17.000000000 -0600
-+++ configure 2010-05-01 03:27:01.000000000 -0500
-@@ -6848,7 +6848,7 @@
- $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
- fi
-
--if test "$have_x"; then
-+if test "$have_x" == yes; then
-
- $as_echo "#define HAVE_X_WINDOWS 1" >>confdefs.h
-
Copied: trunk/dports/math/octave/files/patch-configure.diff (from rev 114016, trunk/dports/math/octave-devel/files/patch-configure.diff)
===================================================================
--- trunk/dports/math/octave/files/patch-configure.diff (rev 0)
+++ trunk/dports/math/octave/files/patch-configure.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,11 @@
+--- configure.orig 2013-11-01 12:13:00.000000000 -0400
++++ configure 2013-11-01 12:44:53.000000000 -0400
+@@ -58248,7 +58248,7 @@
+ main ()
+ {
+
+- std::unordered_map m;
++ std::unordered_map<int,int> m;
+
+ ;
+ return 0;
Copied: trunk/dports/math/octave/files/patch-liboctave-eigs-base.cc.diff (from rev 114016, trunk/dports/math/octave-devel/files/patch-liboctave-eigs-base.cc.diff)
===================================================================
--- trunk/dports/math/octave/files/patch-liboctave-eigs-base.cc.diff (rev 0)
+++ trunk/dports/math/octave/files/patch-liboctave-eigs-base.cc.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,58 @@
+--- liboctave/eigs-base.cc.orig 2013-07-08 16:37:38.000000000 -0400
++++ liboctave/eigs-base.cc 2013-07-08 16:47:33.000000000 -0400
+@@ -3833,43 +3833,43 @@
+ #endif
+
+ #ifndef _MSC_VER
+-template static octave_idx_type
++template octave_idx_type
+ lusolve (const SparseMatrix&, const SparseMatrix&, Matrix&);
+
+-template static octave_idx_type
++template octave_idx_type
+ lusolve (const SparseComplexMatrix&, const SparseComplexMatrix&,
+ ComplexMatrix&);
+
+-template static octave_idx_type
++template octave_idx_type
+ lusolve (const Matrix&, const Matrix&, Matrix&);
+
+-template static octave_idx_type
++template octave_idx_type
+ lusolve (const ComplexMatrix&, const ComplexMatrix&, ComplexMatrix&);
+
+-template static ComplexMatrix
++template ComplexMatrix
+ ltsolve (const SparseComplexMatrix&, const ColumnVector&,
+ const ComplexMatrix&);
+
+-template static Matrix
++template Matrix
+ ltsolve (const SparseMatrix&, const ColumnVector&, const Matrix&);
+
+-template static ComplexMatrix
++template ComplexMatrix
+ ltsolve (const ComplexMatrix&, const ColumnVector&, const ComplexMatrix&);
+
+-template static Matrix
++template Matrix
+ ltsolve (const Matrix&, const ColumnVector&, const Matrix&);
+
+-template static ComplexMatrix
++template ComplexMatrix
+ utsolve (const SparseComplexMatrix&, const ColumnVector&,
+ const ComplexMatrix&);
+
+-template static Matrix
++template Matrix
+ utsolve (const SparseMatrix&, const ColumnVector&, const Matrix&);
+
+-template static ComplexMatrix
++template ComplexMatrix
+ utsolve (const ComplexMatrix&, const ColumnVector&, const ComplexMatrix&);
+
+-template static Matrix
++template Matrix
+ utsolve (const Matrix&, const ColumnVector&, const Matrix&);
+ #endif
+
Copied: trunk/dports/math/octave/files/patch-liboctave-regexp.h.diff (from rev 114016, trunk/dports/math/octave-devel/files/patch-liboctave-regexp.h.diff)
===================================================================
--- trunk/dports/math/octave/files/patch-liboctave-regexp.h.diff (rev 0)
+++ trunk/dports/math/octave/files/patch-liboctave-regexp.h.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,11 @@
+--- liboctave/regexp.h.orig 2013-07-08 15:56:42.000000000 -0400
++++ liboctave/regexp.h 2013-07-08 15:56:48.000000000 -0400
+@@ -87,7 +87,7 @@
+ std::string replace (const std::string& buffer,
+ const std::string& replacement);
+
+- struct opts
++ class opts
+ {
+ public:
+
Deleted: trunk/dports/math/octave/files/patch-liboctave_oct-alloc.h.diff
===================================================================
--- trunk/dports/math/octave/files/patch-liboctave_oct-alloc.h.diff 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave/files/patch-liboctave_oct-alloc.h.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,13 +0,0 @@
---- liboctave/oct-alloc.h.orig 2013-04-23 10:09:26.000000000 -0400
-+++ liboctave/oct-alloc.h 2013-04-23 10:09:09.000000000 -0400
-@@ -24,6 +24,10 @@
- #if !defined (octave_oct_alloc_h)
- #define octave_oct_alloc_h 1
-
-+#if !defined(size_t) && defined(HAVE_SYS_TYPES_H)
-+#include <sys/types.h>
-+#endif
-+
- class
- OCTAVE_API
- octave_allocator
Deleted: trunk/dports/math/octave/files/patch-liboctave_oct-inttypes.h.diff
===================================================================
--- trunk/dports/math/octave/files/patch-liboctave_oct-inttypes.h.diff 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave/files/patch-liboctave_oct-inttypes.h.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,20 +0,0 @@
---- liboctave/oct-inttypes.h.orig 2013-04-23 09:15:24.000000000 -0400
-+++ liboctave/oct-inttypes.h 2013-04-23 09:15:55.000000000 -0400
-@@ -416,7 +416,7 @@
- {
- // Promotion type for multiplication (if exists).
- typedef typename query_integer_type<2*sizeof (T), false>::type mptype;
-- return truncate_int (static_cast<mptype> (x)
-+ return octave_int_base<T>::truncate_int (static_cast<mptype> (x)
- * static_cast<mptype> (y));
- }
-
-@@ -669,7 +669,7 @@
- {
- // Promotion type for multiplication (if exists).
- typedef typename query_integer_type<2*sizeof (T), true>::type mptype;
-- return truncate_int (static_cast<mptype> (x)
-+ return octave_int_base<T>::truncate_int (static_cast<mptype> (x)
- * static_cast<mptype> (y));
- }
-
Deleted: trunk/dports/math/octave/files/patch-lo-specfun.cc.diff
===================================================================
--- trunk/dports/math/octave/files/patch-lo-specfun.cc.diff 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave/files/patch-lo-specfun.cc.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,15 +0,0 @@
---- liboctave/lo-specfun.cc
-+++ liboctave/lo-specfun.cc
-@@ -25,6 +25,12 @@
- #include <config.h>
- #endif
-
-+#if !defined (_REENTRANT)
-+#define _REENTRANT
-+#endif
-+#include <cmath>
-+#undef _REENTRANT
-+
- #include "Range.h"
- #include "CColVector.h"
- #include "CMatrix.h"
Copied: trunk/dports/math/octave/files/patch-src-display.cc.diff (from rev 114016, trunk/dports/math/octave-devel/files/patch-src-display.cc.diff)
===================================================================
--- trunk/dports/math/octave/files/patch-src-display.cc.diff (rev 0)
+++ trunk/dports/math/octave/files/patch-src-display.cc.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,32 @@
+--- src/display.cc.orig 2012-09-21 11:29:13.000000000 -0400
++++ src/display.cc 2012-09-21 11:29:27.000000000 -0400
+@@ -41,6 +41,29 @@
+
+ display_info *display_info::instance = 0;
+
++#if defined (HAVE_FRAMEWORK_CARBON)
++// for 10.7 and newer only; would work with 10.6, but the function
++// "CGDisplayBitsPerPixel" is still provided by the Carbon framework
++// with a warning that it will be deprecated (but, it works).
++size_t
++CGDisplayBitsPerPixel (CGDirectDisplayID display)
++{
++ CGDisplayModeRef originalMode = CGDisplayCopyDisplayMode (display);
++ CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding (originalMode);
++ size_t rv = 8;
++
++ if (CFStringCompare (pixelEncoding, CFSTR (IO32BitDirectPixels), 0) == 0) {
++ rv = 32;
++ } else {
++ if (CFStringCompare (pixelEncoding, CFSTR (IO16BitDirectPixels), 0) == 0) {
++ rv = 16;
++ }
++ // else rv <= 8, by default.
++ }
++ return (rv);
++}
++#endif
++
+ void
+ display_info::init (bool query)
+ {
Deleted: trunk/dports/math/octave/files/patch-src_pr-output.cc.diff
===================================================================
--- trunk/dports/math/octave/files/patch-src_pr-output.cc.diff 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave/files/patch-src_pr-output.cc.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,11 +0,0 @@
---- src/pr-output.cc.orig 2013-04-23 10:01:54.000000000 -0400
-+++ src/pr-output.cc 2013-04-23 10:02:49.000000000 -0400
-@@ -2854,7 +2854,7 @@
- }
-
- #define INSTANTIATE_ABS(T) \
-- template /* static */ inline T abs (T)
-+ template /* static */ T abs (T)
-
- INSTANTIATE_ABS(signed char);
- INSTANTIATE_ABS(short);
Deleted: trunk/dports/math/octave/files/patch-urlwrite.cc.diff
===================================================================
--- trunk/dports/math/octave/files/patch-urlwrite.cc.diff 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave/files/patch-urlwrite.cc.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,11 +0,0 @@
---- src/DLD-FUNCTIONS/urlwrite.cc.orig 2009-05-25 15:05:00.000000000 +0900
-+++ src/DLD-FUNCTIONS/urlwrite.cc 2012-09-16 18:32:46.000000000 +0900
-@@ -46,7 +46,7 @@
- #if defined (HAVE_CURL)
-
- #include <curl/curl.h>
--#include <curl/types.h>
-+//#include <curl/types.h>
- #include <curl/easy.h>
-
- // Write callback function for curl.
Modified: trunk/dports/math/octave-ad/Portfile
===================================================================
--- trunk/dports/math/octave-ad/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-ad/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -7,9 +8,10 @@
platforms darwin
license GPL-2+
maintainers nomaintainer
-description Automatic Forward Differentiation
+description Automatic Forward Differentiation.
long_description ${description}
-checksums md5 9162813e37bad34c4277a30dd9d968da \
- sha1 71e32c0001c61dd62eec84f2d61e754dec5bcf2e \
- rmd160 1fdd5216d31035a03b5b6df6fe83fc0ebeca195c
+checksums rmd160 1fdd5216d31035a03b5b6df6fe83fc0ebeca195c \
+ sha256 34de01d167f30035955a6fe4137f2f7fec0fa862ffd1ab892cb9b31dd18174c4
+
+patchfiles patch-src_ov-grad.cc.diff
Added: trunk/dports/math/octave-ad/files/patch-src_ov-grad.cc.diff
===================================================================
--- trunk/dports/math/octave-ad/files/patch-src_ov-grad.cc.diff (rev 0)
+++ trunk/dports/math/octave-ad/files/patch-src_ov-grad.cc.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,15 @@
+--- src/ov-grad.cc.orig 2013-11-16 14:35:03.000000000 -0500
++++ src/ov-grad.cc 2013-11-16 14:35:34.000000000 -0500
+@@ -71,10 +71,10 @@
+
+ void octave_gradient::print (std::ostream& os, bool pr_as_read_syntax) const
+ {
+- x ().print_with_name (os, "value", true);
++ x ().print_with_name (os, "value");
+ // print (partial) derivative(s),
+ // following convention i-th row = nabla(x_i)T
+- jacobian ().print_with_name (os, "(partial) derivative(s)", true);
++ jacobian ().print_with_name (os, "(partial) derivative(s)");
+ }
+
+ octave_value_list octave_gradient::dotref (const octave_value_list& idx)
Modified: trunk/dports/math/octave-ann/Portfile
===================================================================
--- trunk/dports/math/octave-ann/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-ann/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,22 +6,23 @@
octave.setup ann 1.0.2
platforms darwin
-license LGPL-2.1+
+license LGPL-2+
maintainers nomaintainer
-description The Octave-forge ANN package wraps the ANN library, which \
- provides data structures and functions for computing exact \
- and approximate nearest neighbors on an arbitrarily high \
- dimensional point set.
+description The Octave-forge ANN package wraps the ANN \
+ library, which provides data structures and \
+ functions for computing exact and approximate \
+ nearest neighbors on an arbitrarily high \
+ dimensional point set. This module does \
+ not work with Octave 3.6 or newer\; this port is \
+ being deprecated.
long_description ${description}
-checksums md5 3b383fdec459cf4f66c221e7b698aab0 \
- sha1 5da0e67273316edbc127ab31bb3e15b89ec25a4f \
- rmd160 4d74c6a5db17caf1d329c0fdac9fe068c0c1ddb5
+depends_build
+depends_lib
+depends_run
-depends_build port:swig-octave
-
-post-patch {
- file delete -force ${worksrcpath}/src/ann/bindings/ann_wrap.cpp
+pre-fetch {
+ ui_msg ""
+ ui_error "$name does not work with Octave 3.6 or newer.\n"
+ error "deprecated Octave module\n"
}
-
-configure.args --with-swig
Modified: trunk/dports/math/octave-arpack/Portfile
===================================================================
--- trunk/dports/math/octave-arpack/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-arpack/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -7,12 +8,18 @@
platforms darwin
license GPL-2+
maintainers nomaintainer
-description Octave bindings to ARPACK, including the eigs and svds \
- function.
+description Octave bindings to ARPACK, including the eigs \
+ and svds function. This module has been \
+ integrated into Octave\; this port is being \
+ deprecated.
long_description ${description}
-checksums md5 dbf767019e238c4a16ccc6cac2afe87c \
- sha1 3fa7847b6bedb2379ff51399195481fbfe2e4b89 \
- rmd160 0d16b935f72b8b7c32721216edf09935eeb8e50f
+depends_build
+depends_lib
+depends_run
-depends_lib-append port:arpack
+pre-fetch {
+ ui_msg ""
+ ui_error "$name in integrated into Octave 3.6 and newer.\n"
+ error "deprecated Octave module\n"
+}
Modified: trunk/dports/math/octave-audio/Portfile
===================================================================
--- trunk/dports/math/octave-audio/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-audio/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -7,9 +8,8 @@
platforms darwin
license GPL-2+ public-domain
maintainers nomaintainer
-description Audio recording, processing and playing tools.
+description Audio recording, processing, and playing tools.
long_description ${description}
-checksums md5 643dac1ecf0f31c870b4bd9ce7bbd98c \
- sha1 36b4257737481394302243cdf1731edbbaee5139 \
- rmd160 0f38a8ef8b7d6571ce6d20ca00f6a636f32976f0
+checksums rmd160 0f38a8ef8b7d6571ce6d20ca00f6a636f32976f0 \
+ sha256 1cc95684b48bc2b2681036b65ed78fe5bc6323ca94b43dea6c005303dd7320e4
Modified: trunk/dports/math/octave-benchmark/Portfile
===================================================================
--- trunk/dports/math/octave-benchmark/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-benchmark/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,11 +6,11 @@
octave.setup benchmark 1.1.1
platforms darwin
-license GPL-2+
+license GPL-2
maintainers nomaintainer
-description The package contains code used to benchmark speed of Octave.
+description The package contains code used to benchmark \
+ speed of Octave.
long_description ${description}
-checksums md5 33842f7c32af5eedbbd0af3b8f918b69 \
- sha1 247e39c21be6e3b8d373965277bf916f4ca8b80d \
- rmd160 a152ed405ce34c8370937c0af449bd98e792e882
+checksums rmd160 a152ed405ce34c8370937c0af449bd98e792e882 \
+ sha256 7fd62c56062fee2efa49d848e85f1f1cf841ccfa629f783af7e95f17326d73db
Modified: trunk/dports/math/octave-bim/Portfile
===================================================================
--- trunk/dports/math/octave-bim/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-bim/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,17 +4,16 @@
PortGroup octave 1.0
-octave.setup bim 0.1.1
+octave.setup bim 1.1.2
platforms darwin
license GPL-2+
maintainers nomaintainer
-description Package for solving Diffusion Advection Reaction (DAR) \
- Partial Differential Equaltions based on the Finite Volume \
- Scharfetter-Gummel (FVSG) method a.k.a Box Integration \
- Method (BIM)
+description Package for solving Diffusion Advection Reaction \
+ (DAR) Partial Differential Equaltions based on \
+ the Finite Volume Scharfetter-Gummel (FVSG) \
+ method a.k.a Box Integration \ Method (BIM).
long_description ${description}
-checksums md5 7e7a3856127c0f17bf98df5d564b224d \
- sha1 573b31f8e0e3f6ed733303c6a47a948b67cd338f \
- rmd160 a917e90a2d0fac5c9569220c3b50d3533f88065f
+checksums rmd160 16e291ce7ca33c876814d12ca2e64b5376fd1cc2 \
+ sha256 5327b8615170f7ce20188d4c17939037e6a5fa64bcc16d9641085fd3c7d7ba76
depends_lib-append port:octave-fpl port:octave-msh
Modified: trunk/dports/math/octave-bioinfo/Portfile
===================================================================
--- trunk/dports/math/octave-bioinfo/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-bioinfo/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,11 +6,10 @@
octave.setup bioinfo 0.1.2
platforms darwin
-license GPL-2 GPL-3+
+license GPL-2+
maintainers nomaintainer
-description Bioinformatics manipulation
+description Bioinformatics manipulation.
long_description ${description}
-checksums md5 71f3319f41d2885c569c840ed137673b \
- sha1 cc62d0250f2f41b5f7ef3ea3095006667fe1e37f \
- rmd160 ef917f6190f1d57fdf72a19b9ff69147102ee6b6
+checksums rmd160 ef917f6190f1d57fdf72a19b9ff69147102ee6b6 \
+ sha256 798acf59cd49f64c4592bf6207f25944d78fcd7a38bf44ed8423d5429261945b
Modified: trunk/dports/math/octave-civil-engineering/Portfile
===================================================================
--- trunk/dports/math/octave-civil-engineering/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-civil-engineering/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -7,9 +8,9 @@
platforms darwin
license GPL-2+
maintainers nomaintainer
-description Functions to solution some ODE's in Civil Engineering.
+description Functions to solution some ODE's in \
+ Civil Engineering.
long_description ${description}
-checksums md5 d04d56f6d85ae17911560b6021ce47a8 \
- sha1 9ad2b073a48b773c7d5bf804ac06a4abb029cba2 \
- rmd160 c677a355f22ce4666c205c0d8782b334143ff844
+checksums rmd160 c677a355f22ce4666c205c0d8782b334143ff844 \
+ sha256 28cc0ab8ecd3574fc02cf71cc402cc2c43322a20b30d74df4d424c1d284c70eb
Modified: trunk/dports/math/octave-combinatorics/Portfile
===================================================================
--- trunk/dports/math/octave-combinatorics/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-combinatorics/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,12 +4,15 @@
PortGroup octave 1.0
-octave.setup combinatorics 1.0.9
+octave.setup combinatorics 2.0.0
platforms darwin
-license GPL-2+
+license GPL-3+
maintainers nomaintainer
-description Combinatorics functions, incuding partitioning.
+description Combinatorics functions, incuding partitioning. \
+ This a dummy package as transition for the \
+ miscellaneous package.
long_description ${description}
-checksums md5 3dd36eb5cbc5511be0d72250ebb28799 \
- sha1 068f22bf8feb69a401bb8267bb2cd87d145df9ef \
- rmd160 f57b4bbf6bb87ba329ba70640bd97e4f3ecc43c1
+checksums rmd160 e24f4fa758539a86af2a8c878a16000e85c082bc \
+ sha256 d261577af62cea2e6de02ff695ee8a9026a40e7e8320873f1d251998e136d2ff
+
+depends_lib-append port:octave-miscellaneous
Modified: trunk/dports/math/octave-communications/Portfile
===================================================================
--- trunk/dports/math/octave-communications/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-communications/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,16 +4,16 @@
PortGroup octave 1.0
-octave.setup communications 1.0.10
+octave.setup communications 1.1.1
revision 1
platforms darwin
-license GPL-2+
+license GPL-3+
maintainers nomaintainer
-description Digital Communications, Error Correcting Codes (Channel \
- Code), Source Code functions, Modulation and Galois Fields
+description Digital Communications, Error Correcting Codes \
+ (Channel Code), Source Code functions, \
+ Modulation and Galois Fields.
long_description ${description}
-checksums md5 cae9f1e4ce2b1c2358e028abe947d168 \
- sha1 b51523d8b10f10fd5519bd218e9bf6d37f698a70 \
- rmd160 210f98df17a5501be36b8fe02535b4ea0da38aad
+checksums rmd160 493653bcd4c52601937fbb0cbc8a9e288dabfe3d \
+ sha256 85e817e524b518695efdca921503f5a6dc09ff83a33e43e69dd716c564929a25
depends_lib-append port:octave-signal
Modified: trunk/dports/math/octave-control/Portfile
===================================================================
--- trunk/dports/math/octave-control/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-control/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,12 +4,13 @@
PortGroup octave 1.0
-octave.setup control 2.4.1
+octave.setup control 2.6.0
platforms darwin
-license GPL-3+ GPL-2+
+license GPL-3+
maintainers nomaintainer
-description Additional Octave Control tools
+description Computer-Aided Control System Design (CACSD) \
+ Tools for GNU Octave, based on the proven \
+ SLICOT Library.
long_description ${description}
-checksums md5 e3312a9866ff6a9ee018f5c6657e7dce \
- sha1 c99e049fda72300a3e77a763b9c5a00829f91c0f \
- rmd160 3d83252b781da93f25e0e3f459cf767b83975b56
+checksums rmd160 cc24f7e5915a29317d945761c3e02b17f6f318f1 \
+ sha256 a989c390e3928a1bf987d9be9a0e63d107649120b8b060d445a76ccf00025bbd
Modified: trunk/dports/math/octave-data-smoothing/Portfile
===================================================================
--- trunk/dports/math/octave-data-smoothing/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-data-smoothing/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,12 +4,13 @@
PortGroup octave 1.0
-octave.setup data-smoothing 1.2.0
+octave.setup data-smoothing 1.3.0
platforms darwin
-license GPL-2+
+license GPL-3+
maintainers nomaintainer
-description Algorithms for smoothing noisy data
+description Algorithms for smoothing noisy data.
long_description ${description}
-checksums md5 d92ea47df22efaa748b125d397de1339 \
- sha1 8a1a48180f644fa11af12d91d4527ce0737ba4ac \
- rmd160 db3266c4cd813162a26997f4fb0219c4ed7d28f1
+checksums rmd160 40fe5723f811dbd8238a27736ccb25af50bb4186 \
+ sha256 012bd7a9681619ed33d8643f3785ba9b17a82febab9b242674fe79746bc31b60
+
+depends_lib-append port:octave-optim
Modified: trunk/dports/math/octave-database/Portfile
===================================================================
--- trunk/dports/math/octave-database/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-database/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,29 +4,65 @@
PortGroup octave 1.0
-octave.setup database 1.0.4
+octave.setup database 2.2.0
platforms darwin
-license BSD GPL-2
+license GPL-3+
maintainers nomaintainer
-description These are bindings that allow SQL queries and other database \
- operations on postgres, mysql, sqlite, and standard ODBC \
- databases from within Octave.
-long_description ${description} A simplified interface that is uniform \
- across all database types is provided, as well as the \
- entire C client API for each database (libpq, libmysqlclient, etc).
+description Interface to SQL databases, currently only \
+ postgresql using libpq.
+long_description ${description}
-checksums md5 3de89d16ad1c5945ebcb90f8759803b0 \
- sha1 ee62edd5c213bc18a9be0a5696ab418b1887b2de \
- rmd160 6e768f1633e5f1f53c0224956135028459b0a505
+checksums rmd160 75fe93e8c62da63ca4d6273652d368366364405d \
+ sha256 b2ee696797c163f6404ef3900142c4b4350b6926f5d49fef46aa06e893ad2698
-patchfiles patch-sqlite3_wrap.cpp.diff \
- patch-odbc_wrap.cpp.diff
-
depends_lib-append port:swig-octave \
- port:postgresql82 \
path:bin/mysql_config5:mysql5 \
port:sqlite3 \
port:unixODBC
-universal_variant no
-configure.cxx_archflags ""
+# set postgresql variants
+set postgresql_suffixes {80 81 82 83 84 90 91 92 93}
+set default_postgresql_suffix 92
+
+set postgresql_ports {}
+set postgresql_variants {}
+foreach s ${postgresql_suffixes} {
+ lappend postgresql_ports postgresql${s}
+ set postgresql_variants "${postgresql_variants} && !\[variant_isset postgresql${s}\]"
+}
+
+set postgresql_variants [string trimleft ${postgresql_variants} " && "]
+
+foreach s ${postgresql_suffixes} {
+ set p postgresql${s}
+ set v [join [split ${s} ""] "."]
+ set i [lsearch -exact ${postgresql_ports} ${p}]
+ set c [lreplace ${postgresql_ports} ${i} ${i}]
+ eval [subst {
+ variant ${p} description "Build ${name} using postgresql ${v}" \
+ conflicts ${c} {
+
+ depends_lib-append \
+ port:postgresql${s}
+ configure.env \
+ PATH=${prefix}/lib/postgresql${s}/bin:$env(PATH)
+
+ }
+ }]
+}
+
+eval [subst {
+ # postgresql is required; default to ${default_postgresql_suffix}.
+
+ if {${postgresql_variants}} {
+ default_variants +postgresql${default_postgresql_suffix}
+ }
+
+ # Make sure -postgresql${default_postgresql_suffix}
+ # was not specified alone
+
+ if {${postgresql_variants}} {
+ ui_error "${name} requires a postgresql to be selected; you cannot use -postgresql${default_postgresql_suffix} as a variant alone."
+ return -code error "Invalid variant selection"
+ }
+}]
Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-devel/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -2,13 +2,11 @@
# $Id$
PortSystem 1.0
-PortGroup active_variants 1.1
-PortGroup compiler_blacklist_versions 1.0
name octave-devel
version 3.6.4
-revision 9
-conflicts octave
+revision 10
+
categories math science
maintainers michaelld openmaintainer
license GPL-3
@@ -23,320 +21,15 @@
modules written in e.g. C++, C or Fortran.
homepage http://www.gnu.org/software/octave/
-master_sites gnu:octave
-dist_subdir octave
-distname octave-${version}
-use_bzip2 yes
-checksums rmd160 b0356f0c5d9366b8129d72ac58bbde837fee1a95 \
- sha256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962
+replaced_by octave
-depends_build port:bison \
- port:flex \
- port:gawk \
- port:gperf \
- port:grep \
- port:gsed \
- port:less \
- path:bin/perl:perl5 \
- port:pkgconfig \
- port:texinfo
+archive_sites
+distfiles
-depends_lib path:lib/libgcc/libgcc_s.1.dylib:libgcc \
- port:arpack \
- port:curl \
- port:fftw-3 \
- port:fftw-3-single \
- port:glpk \
- port:GraphicsMagick \
- port:hdf5-18 \
- port:ncurses \
- port:pcre \
- port:qhull \
- port:qrupdate \
- port:readline \
- port:SuiteSparse \
- port:zlib
-
-depends_run-append port:epstool \
- port:ghostscript \
- port:gnuplot \
- port:less \
- port:transfig \
- port:pstoedit
-
-universal_variant no
-
-# common configure arguments
-
-configure.args --disable-dependency-tracking \
- --with-umfpack="-lumfpack -lSuiteSparse"
-
-# octave uses a number of other ports to create sources from template:
-# perl, gawk, gsed, flex, bison, texinfo. Make sure these are the
-# MacPorts' versions. Python is not used if perl is available, so
-# clear it out. grep is checked for in 'configure', but not used
-# except inside that script; include it here for completion.
-
-configure.perl ${prefix}/bin/perl
-configure.python ' '
-configure.awk ${prefix}/bin/gawk
-configure.env-append GREP="${prefix}/bin/grep" \
- SED="${prefix}/bin/gsed" \
- TEXI2DVI="${prefix}/bin/texi2dvi" \
- TEXI2PDF="${prefix}/bin/texi2pdf"
-configure.cppflags
-configure.ldflags
-
-test.run yes
-test.target check
-
-# temporary patches; these are, or will be, fixed upstream already.
-
-patchfiles-append \
- patch-liboctave-eigs-base.cc.diff \
- patch-liboctave-regexp.h.diff \
- patch-configure.diff
-
-# Block compilers: Some older versions of CLANG do not honor the CPATH
-# environment variables, which is required for compiling this port
-# when using MacPorts. The versions seem to be: MacPorts CLANG 2.9 or
-# earlier, and Apple CLANG 318.0.58 or older.
-#
-# See also < http://llvm.org/bugs/show_bug.cgi?id=8971 >
-# < https://trac.macports.org/ticket/40250 >.
-
-compiler.blacklist-append { clang <= 318.0.61 } macports-clang-2.9
-
-platform darwin {
- if {${os.major} >= 11} {
-
- # 10.7+ requires an extra patch; this patch will break the
- # build on 10.6 and prior, so apply it only under 10.7.
-
- patchfiles-append patch-src-display.cc.diff
- }
- if {${os.major} >= 12} {
-
- # In 10.8+, the LANG environment variable needs to be set to
- # "C" otherwise /usr/bin/sed fails with an error. Ideally,
- # octave's build system would honor the environment variable
- # ${SED} throughout; reality is that it does not, so this
- # addition is required because /usr/bin/sed will be used.
-
- build.args-append LANG="C"
- }
-}
-
-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set gcc_default "4.8"
-
-# create g95 variant, with full conflicts of GCC versions
-
-set gcc_conflicts ""
-foreach ver ${gcc_versions} {
- set gcc_ver_no_dot gcc[join [split ${ver} "."] ""]
- set gcc_conflicts "${gcc_conflicts} ${gcc_ver_no_dot}"
-}
-
-eval [subst {
- variant g95 conflicts ${gcc_conflicts} requires accelerate \
- description "Build with MacPorts g95 as the Fortran Compiler" {
- depends_build-append port:g95
- configure.fc ${prefix}/bin/g95
- configure.f77 ${prefix}/bin/g95
- configure.f90 ${prefix}/bin/g95
- }
-}]
-
-# create GCC variants, with partial conflicts of other GCC versions
-
-foreach ver1 ${gcc_versions} {
-
- set gcc_ver1_no_dot gcc[join [split ${ver1} "."] ""]
-
- set gcc_conflicts "conflicts g95"
- foreach ver2 ${gcc_versions} {
- if {${ver1} == ${ver2}} {
- continue
- }
- set gcc_ver2_no_dot gcc[join [split ${ver2} "."] ""]
- set gcc_conflicts "${gcc_conflicts} ${gcc_ver2_no_dot}"
- }
-
- eval [subst {
- variant ${gcc_ver1_no_dot} ${gcc_conflicts} \
- description "Build with the MacPorts ${gcc_ver1_no_dot} as the Fortran Compiler" {
- configure.fc ${prefix}/bin/gfortran-mp-${ver1}
- configure.f77 ${prefix}/bin/gfortran-mp-${ver1}
- configure.f90 ${prefix}/bin/gfortran-mp-${ver1}
- }
- }]
-}
-
-# check for setting the default variant
-
-set var_selection ""
-if {[variant_isset g95]} {
- set var_selection "g95"
-} else {
- foreach ver ${gcc_versions} {
- set gcc_ver_no_dot gcc[join [split ${ver} "."] ""]
- if {[variant_isset ${gcc_ver_no_dot}]} {
- set var_selection "${gcc_ver_no_dot}"
- }
- }
-}
-
-# check for need for default variant
-
-set gcc_default_no_dot gcc[join [split ${gcc_default} "."] ""]
-if {"${var_selection}" == ""} {
- default_variants +${gcc_default_no_dot}
-}
-
-# check if the user disabled just the default variant
-
-set var_selection ""
-if {[variant_isset g95]} {
- set var_selection "g95"
-} else {
- foreach ver ${gcc_versions} {
- set gcc_ver_no_dot gcc[join [split ${ver} "."] ""]
- if {[variant_isset ${gcc_ver_no_dot}]} {
- set var_selection "${gcc_ver_no_dot}"
- }
- }
-}
-
-if {"${var_selection}" == ""} {
- ui_error "\n\nYou cannot use the -${gcc_default_no_dot} variant alone; a Fortran compiler is required.\n"
- return -code error "Invalid variant selection"
-}
-
-# atlas does not work with g95, so always conflict with it
-
-variant atlas description {use BLAS from MacPorts' atlas port} \
- conflicts g95 accelerate {}
-
-variant accelerate description \
- {use BLAS from Apple's Accelerate.framework [might be buggy]} \
- conflicts atlas {}
-
-if {![variant_isset accelerate] && ![variant_isset atlas]} {
- default_variants +atlas
-}
-
-# make sure that either +accelerate or +atlas is selected
-
-if {![variant_isset accelerate] && ![variant_isset atlas]} {
-
- ui_error "\n\nYou must select either the +accelerate or +atlas variant.\n"
- return -code error "Invalid variant selection"
-
-}
-
-if {[variant_isset accelerate]} {
-
- depends_lib-append port:dotwrp
- configure.args-append \
- --with-blas="-ldotwrp -Wl,-framework -Wl,Accelerate" \
- --with-lapack="-Wl,-framework -Wl,Accelerate"
-
-} else {
-
- depends_lib-append port:atlas
- # NOTE: libtatlas does not work as of 3.10.1_5
- configure.args-append \
- --with-blas="-lcblas -lf77blas -latlas" \
- --with-lapack="-llapack -lgfortran"
-
-}
-
-variant docs description {Enable creation and installation of \
- documentation including manpages} {}
-
-if {[variant_isset docs]} {
-
- depends_run-append port:texlive-basic
- # latex needed for lcircle10 font etc.
- depends_build-append port:texlive-latex
- configure.args-append --enable-docs
-
-} else {
-
- configure.args-append --disable-docs
-
-}
-
-variant x11 description {Enable use of X11} {}
-
-if {[variant_isset x11]} {
-
- configure.args-append --with-x --x-includes=${prefix}
-
-} else {
-
- configure.args-append --without-x
-
-}
-
-variant fltk description {Enable FLTK as a graphical front-end} {}
-
-if {[variant_isset fltk]} {
-
- depends_lib-append path:lib/libfltk.dylib:fltk \
- port:fontconfig \
- port:freetype
- configure.args-append --with-opengl
-
-} else {
-
- configure.args-append --without-opengl
-
-}
-
-variant metis description {Use SuiteSparse + Metis for graph partitioning} {
- pre-fetch {
- ui_msg "\nWARNING: ${name} variant +metis uses the metis port, whose license is incompatible with Octave's. You can use this combination locally, but you cannot distribute them as a single package (e.g., tarball, m/pkg, archive)."
- }
-}
-
-if {[variant_isset metis]} {
-
- depends_lib-append port:metis
- configure.args-append --with-cholmod="-lcholmod -lmetis"
-
- # make sure SuiteSparse is installed with +metis
- require_active_variants SuiteSparse metis
-
-} else {
-
- configure.args-append --with-cholmod="-lcholmod"
-
- # make sure SuiteSparse is installed without +metis
- require_active_variants SuiteSparse {} metis
-
-}
-
pre-fetch {
-
- # check for +accelerate here as well as in dependent ports;
- # Apple's VecLib has bugs that cause Octave to crash sometimes,
- # while Atlas does not have these issues. Print a warning if this
- # variant is in use, but do not force the use of +atlas (for now).
-
- if {![catch {set result [active_variants arpack accelerate {}]}]} {
- if {$result} {
- ui_msg "\nWARNING: Dependency 'arpack' is installed with the +accelerate variant, using Apple's Vector Libraries which have known bugs that can cause Octave to crash if using certain functions in arpack. The +atlas variant does not have these issues with Octave, and is considered by Octave developers a better way to go.\n"
- }
- }
-
- if {[variant_isset accelerate]} {
- ui_msg "\nWARNING: The +accelerate variant has been selected, using Apple's Vector Libraries which have known bugs that can cause Octave to crash. The +atlas variant does not have these issues with Octave, and is considered by Octave developers a better way to go.\n"
- }
+ ui_error "${subport} has been temporarily replaced by the port 'octave'. Please install octave instead."
+ return -code error "obsolete port"
}
-livecheck.type regex
-livecheck.url http://www.gnu.org/software/octave/download.html
-livecheck.regex GNU Octave (\[\^\ \]*) was
+livecheck.type none
Modified: trunk/dports/math/octave-econometrics/Portfile
===================================================================
--- trunk/dports/math/octave-econometrics/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-econometrics/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,13 +4,14 @@
PortGroup octave 1.0
-octave.setup econometrics 1.0.8
+octave.setup econometrics 1.1.1
platforms darwin
-license GPL-2+
+license GPL-3+
maintainers nomaintainer
-description Econometrics functions including MLE and GMM based \
- techniques.
+description Econometrics functions including MLE and \
+ GMM based techniques.
long_description ${description}
-checksums md5 363cdacabfc3b551a500e9c8bf5c4437 \
- sha1 96d96b7b0cd18b4f911b92630f62df9fdc138182 \
- rmd160 3fa1e689a75ae3e9b04d708800accb758181921a
+checksums rmd160 e04d04f94531a86ef7d77ef18ea121db1d26f002 \
+ sha256 b982f842273935c2e3441d09512611e03d4fee6a7c45532909594d41593ff3ee
+
+depends_lib-append port:octave-optim
Modified: trunk/dports/math/octave-engine/Portfile
===================================================================
--- trunk/dports/math/octave-engine/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-engine/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,11 +6,10 @@
octave.setup engine 1.0.9
platforms darwin
-license GPL-2
+license GPL-2+
maintainers nomaintainer
-description An external interface library for Octave
+description An external interface library for Octave.
long_description ${description}
-checksums md5 077ec874eb6ff573e86448a1c4620a1d \
- sha1 b39f8e86bbc688a83ab433133bcc23bc4de7e16a \
- rmd160 fd1c51ea614c568152ff02e219ec2a86b24adcf9
+checksums rmd160 fd1c51ea614c568152ff02e219ec2a86b24adcf9 \
+ sha256 284733f08084fe9980fba80b11951dbec494adbaa9df267183bd0e677abcc741
Modified: trunk/dports/math/octave-financial/Portfile
===================================================================
--- trunk/dports/math/octave-financial/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-financial/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,14 +4,14 @@
PortGroup octave 1.0
-octave.setup financial 0.3.2
+octave.setup financial 0.4.0
platforms darwin
-license GPL-2 GPL-3+
+license GPL-3+
maintainers nomaintainer
-description Financial manipulation and plotting functions
+description Financial manipulation, plotting functions \
+ and additional date manipulation tools.
long_description ${description}
-checksums md5 ea871683241da80f766b9af006b78865 \
- sha1 b51db6769f6591ce49a8a1060a06744dceab66cf \
- rmd160 1f9f087ed2c8053055e4e2938a1fd23079673c25
+checksums rmd160 8937001db6b781c0498d89ef282190e0d9d4c57a \
+ sha256 1c88ec39db9899c70dc1480af5319e75944574619dad1cead46362521ce2596d
-depends_lib-append port:octave-time
+depends_lib-append port:octave-io
Modified: trunk/dports/math/octave-fpl/Portfile
===================================================================
--- trunk/dports/math/octave-fpl/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-fpl/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,13 +4,13 @@
PortGroup octave 1.0
-octave.setup fpl 0.1.6
+octave.setup fpl 1.3.4
platforms darwin
-license GPL-2+
+license GPL-3+
maintainers nomaintainer
-description Collection of routines to plot data on unstructured \
- triangular and tetrahedral meshes
+description Collection of routines to export data produced \
+ by Finite Elements or Finite Volume Simulations \
+ in formats used by some visualization programs.
long_description ${description}
-checksums md5 65f181620dcfb3a7083908dcfcf3477f \
- sha1 67b351a8e0b2b1874adfc9bc61d1caab067e9078 \
- rmd160 a1edb91daae8bf57c2eeb24d50d7e2a87d769459
+checksums rmd160 9177ee7e66c49147fea8256177a1f0a2d2732540 \
+ sha256 ac8532c8b58524f31c4d4bda703596926b94e04d53016b41db276bcbac83c2a1
Modified: trunk/dports/math/octave-ga/Portfile
===================================================================
--- trunk/dports/math/octave-ga/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-ga/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,15 +4,11 @@
PortGroup octave 1.0
-octave.setup ga 0.9.7
-revision 1
+octave.setup ga 0.10.0
platforms darwin
license GPL-2+
maintainers nomaintainer
-description Genetic optimization code
+description Genetic optimization code.
long_description ${description}
-checksums md5 4dc07aedf067fdefbb4bf845375c2715 \
- sha1 f05be56a1a91b514025b31cd8739370698571ca5 \
- rmd160 a232210c86d11d09cec0872853b3b479a156da8d
-
-depends_lib-append port:octave-miscellaneous port:octave-communications
+checksums rmd160 e746d11fbf886ed6c80839f767c60b6eed9e2b0f \
+ sha256 17e234d99ebd69dfcd2f28b1d0437277f35fc39953661eedbd6c0c3c03342f0b
Modified: trunk/dports/math/octave-general/Portfile
===================================================================
--- trunk/dports/math/octave-general/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-general/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,11 +6,11 @@
octave.setup general 1.3.2
platforms darwin
-license GPL-2+ GPL-3+
+license GPL-3+ BSD public-domain
maintainers nomaintainer
-description General tools for octave.
+description General tools for Octave, string dictionary, \
+ parallel computing.
long_description ${description}
-checksums md5 4419e594b38d39cbee61a44b33dbf702 \
- sha1 1662d97f0bf1be957e1a30a287d9c0aff7b5ecdd \
- rmd160 925565a5444eaffcaefc2a7350148de9cd62080f
+checksums rmd160 925565a5444eaffcaefc2a7350148de9cd62080f \
+ sha256 1248c563256a6662b321fba6f7e9da435c81b4a52efad19b0e1d9930ce3b4e92
Modified: trunk/dports/math/octave-graceplot/Portfile
===================================================================
--- trunk/dports/math/octave-graceplot/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-graceplot/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -7,11 +8,17 @@
platforms darwin
license GPL-2+ public-domain
maintainers nomaintainer
-description Graceplot bindings for octave.
+description Graceplot bindings for octave. This module does \
+ not work with Octave 3.6 or newer\; this port is \
+ being deprecated.
long_description ${description}
-checksums md5 3e123bea0ab347e938758d9d3bf1d7a2 \
- sha1 34bfd5073007fc3d5cf1a430176580907ac86d32 \
- rmd160 8887482e2412974cf05f4eee7558f10e1e712b3e
+depends_build
+depends_lib
+depends_run
-depends_lib-append port:octave-io
+pre-fetch {
+ ui_msg ""
+ ui_error "$name does not work with Octave 3.6 or newer.\n"
+ error "deprecated Octave module\n"
+}
Modified: trunk/dports/math/octave-gsl/Portfile
===================================================================
--- trunk/dports/math/octave-gsl/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-gsl/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,13 +6,12 @@
octave.setup gsl 1.0.8
platforms darwin
-license GPL-2+ GPL-3+
+license GPL-2+
maintainers nomaintainer
-description Octave bindings to the GNU Scientific Library
+description Octave bindings to the GNU Scientific Library.
long_description ${description}
-checksums md5 9f45ab71dc77b57646d6bfab5984cccd \
- sha1 2a7d06963e00d44f92682edd7ec1d5036574bf41 \
- rmd160 34c9d705ffc5b59c656219a0a5bcadceda73d6f7
+checksums rmd160 34c9d705ffc5b59c656219a0a5bcadceda73d6f7 \
+ sha256 a8344d508ba6f376ca0c0734a72aac1080690cfe74f32c5e964ad765d81adfb3
depends_lib-append port:gsl
Modified: trunk/dports/math/octave-ident/Portfile
===================================================================
--- trunk/dports/math/octave-ident/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-ident/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -10,6 +11,9 @@
description Addition System Indentification Control functions.
long_description ${description}
-checksums md5 29697948e4af19d868abc00d373278fb \
- sha1 5852903addf9038b301fdc1d15429b4f19a1bf99 \
- rmd160 bd768d51f36f21d3d826ab524eb42f7b8bb1e9ab
+checksums rmd160 bd768d51f36f21d3d826ab524eb42f7b8bb1e9ab \
+ sha256 977fc3012dff2c825e8638f663e0dd97f1b984cb4cdb4e4a4eeaa35c25c0d5ba
+
+# no longer exists on octave-forge
+
+livecheck.type none
Modified: trunk/dports/math/octave-image/Portfile
===================================================================
--- trunk/dports/math/octave-image/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-image/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,20 +4,18 @@
PortGroup octave 1.0
-octave.setup image 1.0.10
+octave.setup image 2.0.0
platforms darwin
-license GPL-2+ GPL-3+ BSD
+license GPL-3+ MIT FreeBSD
maintainers nomaintainer
-description The Octave-forge Image package provides functions for \
- reading, writing, and processing images. The package \
- supports almost all image formats through the use of \
- ImageMagick. The package also provides functions for \
- feature extraction, image statistics, spatial and \
- geometric transformations, morphological operations, \
- linear filtering, and much more.
+description The Octave-forge Image package provides functions \
+ for processing images. The package also provides \
+ functions for feature extraction, image \
+ statistics, spatial and geometric transformations, \
+ morphological operations, linear filtering, and \
+ much more.
long_description ${description}
-checksums md5 c139877a4ce2b1f6fe08772a52a327be \
- sha1 0d8731f8f47cc18fdfb2ead8e700d3507cff79df \
- rmd160 3aad306325c84cfe543c7b61b60a7fea2cfa9c3c
+checksums rmd160 82205cc0e884020958ba5b8644eb9f34818a175c \
+ sha256 fecacf1cf78e2517f9e3eda243925c71f3b247aaac5dc7b5ea3af7d2208af1d9
-patchfiles png14.patch
+depends_lib-append port:octave-signal
Modified: trunk/dports/math/octave-informationtheory/Portfile
===================================================================
--- trunk/dports/math/octave-informationtheory/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-informationtheory/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -7,10 +8,9 @@
platforms darwin
license GPL-2+
maintainers nomaintainer
-description Functions and routines for basic Information Theory \
- definitions, and source coding.
+description Functions and routines for basic Information \
+ Theory definitions, and source coding.
long_description ${description}
-checksums md5 8948c888555cd4377edcc3cdc8611bee \
- sha1 6f8ec439fc764c1140de8e44cdf0c1655683c861 \
- rmd160 bd79132384e307dcebd805e5a1ab2ab4af171b43
+checksums rmd160 bd79132384e307dcebd805e5a1ab2ab4af171b43 \
+ sha256 ba18b923a9e161fd90c8982c3c96217d66086d2664df609b6cf35e8e3d51d7d1
Modified: trunk/dports/math/octave-integration/Portfile
===================================================================
--- trunk/dports/math/octave-integration/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-integration/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,11 +6,10 @@
octave.setup integration 1.0.7
platforms darwin
-license GPL-2
+license GPL-2+
maintainers nomaintainer
-description Toolbox for 1-D, 2-D, and n-D Numerical Integration
+description Toolbox for 1-D, 2-D, and n-D Numerical Integration.
long_description ${description}
-checksums md5 ccd4224ec51e35ccd50c6a119f304284 \
- sha1 b9d66b79391aef4bc574af62e716edfe833d9aa8 \
- rmd160 2340ae906e77ba64a31b08ca548f1ecaf2eee79e
+checksums rmd160 2340ae906e77ba64a31b08ca548f1ecaf2eee79e \
+ sha256 b9035ea89b6834feb146fe4e8749a9289d4a26f2de40e79ad74e5ce3532e3ea7
Modified: trunk/dports/math/octave-io/Portfile
===================================================================
--- trunk/dports/math/octave-io/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-io/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,12 +4,11 @@
PortGroup octave 1.0
-octave.setup io 1.0.9
+octave.setup io 1.2.4
platforms darwin
-license GPL-2+ GPL-3+ BSD
+license GPL-3+ BSD
maintainers nomaintainer
description Input/Output in external formats.
long_description ${description}
-checksums md5 a53eb6864746d230240745a8f82c0d0b \
- sha1 2c9e3d9b94aba55f97d42dbf91d7d8c6b6af2f21 \
- rmd160 a6009ca3afe53573624348bbd8d449679badbabb
+checksums rmd160 8b3a75b52e436e76f14b7266427d5c37f92c2831 \
+ sha256 3f3bc13b074adab4c6f9c2c37d8f4540d6c2d83dad1b2abb1732422f9c302f88
Modified: trunk/dports/math/octave-irsa/Portfile
===================================================================
--- trunk/dports/math/octave-irsa/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-irsa/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -10,6 +11,5 @@
description Irregular sampling analysis.
long_description ${description}
-checksums md5 1e1d48ad70334be377e156b81012c6a6 \
- sha1 037cc804a3688e74c1f096d3435ae315bf480f82 \
- rmd160 83343bbcb302f9ecbad311e879536ee7d540aaff
+checksums rmd160 83343bbcb302f9ecbad311e879536ee7d540aaff \
+ sha256 244c344e1217e3323aac46142c087ba303e5af2e2169cc7ea3287f4b5f2fe07c
Modified: trunk/dports/math/octave-java/Portfile
===================================================================
--- trunk/dports/math/octave-java/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-java/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,13 +4,16 @@
PortGroup octave 1.0
-octave.setup java 1.2.6
+octave.setup java 1.2.9
platforms darwin
license GPL-2+
maintainers nomaintainer
-description Provides Java interface with OO-like Java objects \
- manipulation
+description Provides Java interface with OO-like Java \
+ objects manipulation.
long_description ${description}
-checksums md5 c6b1dc49493fd7ede6fd369538321161 \
- sha1 b2bdb114dc84b9ecd9be8f529156ab7324ffe294 \
- rmd160 a61788055ee1e55af536eb62cc87ff92eaf05f06
+checksums rmd160 92381c184001c131ac49aff387dbb06f3fb02493 \
+ sha256 e2292c71456b01c3818c3bff3709908f4195277a9f11d83825cc4d815212fbfe
+
+patchfiles-append patch-src_configure.diff
+
+configure.env-append JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
Added: trunk/dports/math/octave-java/files/patch-src_configure.diff
===================================================================
--- trunk/dports/math/octave-java/files/patch-src_configure.diff (rev 0)
+++ trunk/dports/math/octave-java/files/patch-src_configure.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,22 @@
+--- src/configure.orig 2013-11-20 12:33:48.000000000 -0500
++++ src/configure 2013-11-20 12:34:28.000000000 -0500
+@@ -3252,8 +3252,8 @@
+ java_version=`$JAVA -version 2>&1 | sed -n -e 's/^java version[^0-9"]*"\([^"]*\)"/\1/p'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $java_version" >&5
+ $as_echo "$java_version" >&6; }
+- java_major=`echo -n $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`
+- java_minor=`echo -n $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`
++ java_major=`echo $ECHO_N $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`
++ java_minor=`echo $ECHO_N $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`
+ if test $java_major -ge 1 -a $java_minor -ge 5; then
+ case "$canonical_host_type" in
+ *-msdosmsvc*)
+@@ -3287,7 +3287,7 @@
+ JAVA_HOME=/usr/lib/jvm
+ fi
+ fi
+- JAVA_HOME=`echo -n $JAVA_HOME | sed -e 's|/$||'`
++ JAVA_HOME=`echo $ECHO_N $JAVA_HOME | sed -e 's|/$||'`
+ if test -z "$JAVA_ARCH"; then
+ if test -d "${JAVA_HOME}/jre/lib/i386"; then
+ JAVA_ARCH="i386";
Modified: trunk/dports/math/octave-linear-algebra/Portfile
===================================================================
--- trunk/dports/math/octave-linear-algebra/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-linear-algebra/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,13 +4,16 @@
PortGroup octave 1.0
-octave.setup linear-algebra 1.0.8
+octave.setup linear-algebra 2.2.0
platforms darwin
-license GPL-2+ GPL-3+ LGPL-2.1+
+license GPL-3+ LGPL-3+ FreeBSD
maintainers nomaintainer
-description Additional linear algebra code, including general SVD and \
- matrix functions.
+description Additional linear algebra code, including \
+ general SVD and matrix functions.
long_description ${description}
-checksums md5 a40aaca0061117cc483eef89c2f9530f \
- sha1 08332368e1d7f933802320fae22c4ed7ab72a9b2 \
- rmd160 e19b067efb39afa244a27c0442af650bf588f72b
+checksums rmd160 19f098c03ceace1e92cfc1cd3aceb56b4d684f46 \
+ sha256 a62c88a0591d325fd9e80b05a18565aa4fa923f2aad709a92d9519adb4731a20
+
+depends_lib-append port:octave-general
+
+patchfiles-append patch-src_Makefile.diff
Added: trunk/dports/math/octave-linear-algebra/files/patch-src_Makefile.diff
===================================================================
--- trunk/dports/math/octave-linear-algebra/files/patch-src_Makefile.diff (rev 0)
+++ trunk/dports/math/octave-linear-algebra/files/patch-src_Makefile.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,28 @@
+--- src/Makefile.orig 2013-11-25 20:40:57.000000000 -0500
++++ src/Makefile 2013-11-25 20:40:46.000000000 -0500
+@@ -5,6 +5,7 @@
+ endif
+
+ LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
++BLAS_LIBS := $(shell mkoctfile -p BLAS_LIBS)
+
+ DEFINES = -DHAVE_CONFIG_H -Wall
+ GSVD_OBJECTS = gsvd.o dbleGSVD.o CmplxGSVD.o
+@@ -25,7 +26,7 @@
+ all : $(TARGETS) pgmres.oct
+
+ $(GSVD_TARGET) : $(GSVD_DEPENDS) $(GSVD_OBJECTS)
+- $(MKOCTFILE) $(DEFINES) $(GSVD_OBJECTS) -o $@ ${LAPACK_LIBS}
++ $(MKOCTFILE) $(DEFINES) $(GSVD_OBJECTS) -o $@ ${LAPACK_LIBS} ${BLAS_LIBS}
+
+ $(GSVD_TEST) : $(GSVD_TARGET)
+
+@@ -46,7 +47,7 @@
+ $(MKOCTFILE) $(DEFINES) $< -o $@
+
+ %.oct: %.cc
+- mkoctfile $(DEFINES) $< -o $@ ${LAPACK_LIBS}
++ mkoctfile $(DEFINES) $< -o $@ ${LAPACK_LIBS} ${BLAS_LIBS}
+
+ .phony: test
+ test: $(GSVD_TEST)
Modified: trunk/dports/math/octave-mapping/Portfile
===================================================================
--- trunk/dports/math/octave-mapping/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-mapping/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -10,6 +11,5 @@
description Simple Mapping functions.
long_description ${description}
-checksums md5 f4b2e181d98111cc0c761b7f5086ed01 \
- sha1 9b8db2f408986f824d4bff9ea5067acfd8593311 \
- rmd160 c28caacd181f05a0f372a59e6404810902206009
+checksums rmd160 c28caacd181f05a0f372a59e6404810902206009 \
+ sha256 204b9694dde40340186df7f8992a569fcf9ce7e69934b9fa02d26531840db926
Modified: trunk/dports/math/octave-miscellaneous/Portfile
===================================================================
--- trunk/dports/math/octave-miscellaneous/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-miscellaneous/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,13 +6,14 @@
octave.setup miscellaneous 1.2.0
platforms darwin
-license GPL-2+ GPL-3+
+license GPL-3+
maintainers nomaintainer
-description Miscellaneous tools including waitbar, xml tools, etc
+description Miscellaneous tools that don't fit somewhere else.
long_description ${description}
+checksums rmd160 464ac6466bdbec74ace310901d567c737e155489 \
+ sha256 3d5cf8adad50e3c214b5e1ba7e62a71a04340592f5c2b027e313e51ef69c6cef
+
depends_lib-append port:octave-general
-checksums md5 6e121c6bf3120516817c32a7137d61f9 \
- sha1 eec920357a581f26b2bc9079e32732b77c3a641b \
- rmd160 464ac6466bdbec74ace310901d567c737e155489
+patchfiles-append patch-src_partarray.cc.diff
Added: trunk/dports/math/octave-miscellaneous/files/patch-src_partarray.cc.diff
===================================================================
--- trunk/dports/math/octave-miscellaneous/files/patch-src_partarray.cc.diff (rev 0)
+++ trunk/dports/math/octave-miscellaneous/files/patch-src_partarray.cc.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,11 @@
+--- src/partarray.cc.orig 2013-11-25 12:27:30.000000000 -0500
++++ src/partarray.cc 2013-11-25 12:27:34.000000000 -0500
+@@ -39,7 +39,7 @@
+ Array<int> nidx (dim_vector (maxdims, 1));
+ // Octave-3.2.4 reports "missing symbol" with Array<Array< > >,
+ // though 3.3.54+ does not
+- Array<octave_idx_type> bidc [maxdims], eidc [maxdims];
++ std::vector < Array<octave_idx_type> > bidc (maxdims), eidc (maxdims);
+ //
+ Array<octave_idx_type> step (dim_vector (maxdims, 1));
+ step(0) = 1;
Modified: trunk/dports/math/octave-missing-functions/Portfile
===================================================================
--- trunk/dports/math/octave-missing-functions/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-missing-functions/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,11 +6,10 @@
octave.setup missing-functions 1.0.2
platforms darwin
-license GPL-3+ public-domain
+license GPL-2+
maintainers nomaintainer
description Find functions that are in Matlab but not in Octave.
long_description ${description}
-checksums md5 d975028d2a0fa9778b4ffedd4c1abba2 \
- sha1 ed641e5af8c1366175b1024c2ae124c15c6986fc \
- rmd160 2dcac957d371610b715397d109c9dd8778e7b7c6
+checksums rmd160 2dcac957d371610b715397d109c9dd8778e7b7c6 \
+ sha256 f8d004a4e24b2f7f3619cf7bfe1e38ed8c38d29ad3c35f25767ddd76b14a1fd0
Modified: trunk/dports/math/octave-msh/Portfile
===================================================================
--- trunk/dports/math/octave-msh/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-msh/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,17 +4,19 @@
PortGroup octave 1.0
-octave.setup msh 0.1.1
+octave.setup msh 1.0.8
platforms darwin
license GPL-2+
maintainers nomaintainer
description Package for creating and managing triangular and \
- tetrahedral meshes for Finite Element or Finite Volume \
- PDE solvers. Uses a mesh data structure compatible with \
- pdetool. Relies on gmsh for unstructured mesh generation.
+ tetrahedral meshes for Finite Element or Finite \
+ Volume PDE solvers. Uses a mesh data structure \
+ compatible with pdetool. Relies on gmsh for \
+ unstructured mesh generation.
long_description ${description}
-checksums md5 74da2651bbbb8425162efd49d5c4e4e8 \
- sha1 a404fa12bbdb3650894e41cb212aaccb48640f99 \
- rmd160 848aececa70ac5c15616ee866dccb959bf0b1927
+checksums rmd160 092f3126f6514ba2797644d84480348316aad4d9 \
+ sha256 b10f396d9e0ccde4284f33a34f4906df915d7ef96a364490bd6c7c973d8c7036
depends_lib-append port:octave-splines
+
+patchfiles-append patch-src_Makefile.in.diff
Added: trunk/dports/math/octave-msh/files/patch-src_Makefile.in.diff
===================================================================
--- trunk/dports/math/octave-msh/files/patch-src_Makefile.in.diff (rev 0)
+++ trunk/dports/math/octave-msh/files/patch-src_Makefile.in.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,19 @@
+--- src/Makefile.in.orig 2013-11-15 11:18:27.000000000 -0500
++++ src/Makefile.in 2013-11-15 11:21:02.000000000 -0500
+@@ -2,13 +2,12 @@
+
+ OCTFILES= mshm_refine.oct mshm_dolfin_read.oct mshm_dolfin_write.oct
+
+-CPPFLAGS += @ac_dolfin_cpp_flags@
+-LDFLAGS += @ac_dolfin_ld_flags@
+-
+ all: $(OCTFILES)
+
+ %.oct: %.cc
+- $(MKOCTFILE) $(CPPFLAGS) $< $(LDFLAGS)
++ CPPFLAGS='$(CPPFLAGS) @ac_dolfin_cpp_flags@' \
++ LDFLAGS='$(LDFLAGS) @ac_dolfin_ld_flags@' \
++ $(MKOCTFILE) $<
+
+ clean:
+ -rm -f *.o core octave-core *.oct *~ *.xml
Modified: trunk/dports/math/octave-multicore/Portfile
===================================================================
--- trunk/dports/math/octave-multicore/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-multicore/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,12 +6,11 @@
octave.setup multicore 0.2.15
platforms darwin
-license GPL-2
+license GPL-2+
maintainers nomaintainer
-description An Octave-forge package providing functions for parallel \
- processing on multiple cores.
+description An Octave-forge package providing functions \
+ for parallel processing on multiple cores.
long_description ${description}
-checksums md5 ae3fc6bf5e54f37924ef6f0b24463bcf \
- sha1 ed62f2b19ba1eede8ce7e7a5f02f737b8c8ad47e \
- rmd160 87c25b5c18f66a0734b6a19a44de35530a29b5a0
+checksums rmd160 87c25b5c18f66a0734b6a19a44de35530a29b5a0 \
+ sha256 342f44e08d2d0faceabd8b9ec1fc73e87d946d1303c37348b15ffbb38f06e209
Modified: trunk/dports/math/octave-nan/Portfile
===================================================================
--- trunk/dports/math/octave-nan/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-nan/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -2,12 +3,16 @@
PortGroup octave 1.0
+PortGroup compiler_blacklist_versions 1.0
-octave.setup nan 1.0.9
+octave.setup nan 2.5.5
platforms darwin
-license GPL-2+ GPL-3+
+license GPL-3+
maintainers nomaintainer
-description Missing value statistical toolbox
+description A statistics and machine learning toolbox for \
+ data with and without missing values.
long_description ${description}
-checksums md5 0621816fb2bdf111e4697f3b08ed8c3c \
- sha1 dfdf4071bd14e62951b84522aef8f38949ecabe4 \
- rmd160 e760c8a7361191afb5b3ee2408d09b6eff13d9b6
+checksums rmd160 9ebae4103080376b5d7f0f2eec27ff797e709c31 \
+ sha256 1c8d03a8bb797bffed7ec1fe40c5b876fdc8e18e5d9c13093a24c68a5f9adeff
+
+patchfiles patch-src_Makefile.diff \
+ patch-src_xptopen.cpp.diff
Added: trunk/dports/math/octave-nan/files/patch-src_Makefile.diff
===================================================================
--- trunk/dports/math/octave-nan/files/patch-src_Makefile.diff (rev 0)
+++ trunk/dports/math/octave-nan/files/patch-src_Makefile.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,65 @@
+--- src/Makefile.orig 2013-11-16 12:10:11.000000000 -0500
++++ src/Makefile 2013-11-16 13:32:54.000000000 -0500
+@@ -28,15 +28,20 @@
+ # Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin;
+ ####################################################
+
+-CC = gcc
+-CXX = g++
++#CC = gcc
++#CXX = g++
+ CFLAGS = -fopenmp -Wall -Wextra -Wconversion -O2 -fPIC
+-OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex
++MKOCTFILE = mkoctfile$(OCTAVE_VERSION)
++OCTMEX = $(MKOCTFILE) --mex
+ RM = rm
+
+ MEX_OPTION += -lgomp CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
+ MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION)
+
++FLIBS = ${shell $(MKOCTFILE) -p FLIBS}
++INCFLAGS = ${shell $(MKOCTFILE) -p INCFLAGS}
++INC_CSTDLIB = -include cstdlib
++
+ PROGS = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex
+
+ mex4o octave: $(PROGS)
+@@ -58,18 +63,16 @@
+ # Octave, MATLAB on Linux
+ #########################################################
+ %.oct: %.cc
+- mkoctfile$(OCTAVE_VERSION) $<
++ INCFLAGS="$(INCFLAGS) $(INC_CSTDLIB)" $(MKOCTFILE) $<
+
+ %.mex: %.cpp
+- $(OCTMEX) $< -lgomp ## Octave
+-%.$(MEX_EXT): %.cpp
+- $(MATMEX) $< -lgomp ## Matlab
++ INCFLAGS="$(INCFLAGS) $(INC_CSTDLIB)" $(OCTMEX) $< $(FLIBS) -lgomp
+
+ svmtrain_mex.mex svmpredict_mex.mex: svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c svmpredict_mex.cpp
+ $(CXX) $(CFLAGS) -c svm.cpp
+- #$(CC) $(CFLAGS) $(INCOCTAVE) -c svm_model_matlab.c
+- env CC=$(CXX) $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.c
+- env CC=$(CXX) $(OCTMEX) svmpredict_mex.cpp svm.o svm_model_matlab.c
++ $(CC) $(CFLAGS) $(INCFLAGS) -c svm_model_matlab.c
++ INCFLAGS="$(INCFLAGS) $(INC_CSTDLIB)" $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o
++ INCFLAGS="$(INCFLAGS) $(INC_CSTDLIB)" $(OCTMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o
+
+ svmtrain_mex.$(MEX_EXT) svmpredict_mex.$(MEX_EXT): svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c svmpredict_mex.cpp
+ $(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -c svm.cpp
+@@ -78,12 +81,12 @@
+ $(MATMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o
+
+ train.$(MEX_EXT) predict.$(MEX_EXT): train.c linear.h tron.o linear.o linear_model_matlab.c
+- $(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c linear_model_matlab.c
++ # $(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c linear_model_matlab.c
+ $(MATMEX) -lblas train.c tron.o linear.o linear_model_matlab.o
+ #$(MATMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o
+
+ train.mex predict.mex: train.c linear.h tron.o linear.o linear_model_matlab.c
+- env CC=$(CXX) $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c
++ $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c
+ #env CC=$(CXX) $(OCTMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o
+
+ linear.o: linear.cpp linear.h
Added: trunk/dports/math/octave-nan/files/patch-src_xptopen.cpp.diff
===================================================================
--- trunk/dports/math/octave-nan/files/patch-src_xptopen.cpp.diff (rev 0)
+++ trunk/dports/math/octave-nan/files/patch-src_xptopen.cpp.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,18 @@
+--- src/xptopen.cpp.orig 2013-11-16 13:29:34.000000000 -0500
++++ src/xptopen.cpp 2013-11-16 13:29:49.000000000 -0500
+@@ -83,12 +83,10 @@
+ #define __BYTE_ORDER __LITTLE_ENDIAN
+ #endif
+
+-#if (defined(BSD) && (BSD >= 199103))
+ #include <machine/endian.h>
+-#define __BIG_ENDIAN _BIG_ENDIAN
+-#define __LITTLE_ENDIAN _LITTLE_ENDIAN
+-#define __BYTE_ORDER _BYTE_ORDER
+-#endif
++#define __BIG_ENDIAN BIG_ENDIAN
++#define __LITTLE_ENDIAN LITTLE_ENDIAN
++#define __BYTE_ORDER BYTE_ORDER
+
+ #ifndef _BYTESWAP_H
+ /* define our own version - needed for Max OS X*/
Modified: trunk/dports/math/octave-nnet/Portfile
===================================================================
--- trunk/dports/math/octave-nnet/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-nnet/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,5 +4,5 @@
PortGroup octave 1.0
-octave.setup nnet 0.1.10
+octave.setup nnet 0.1.13
platforms darwin
license GPL-2+
@@ -10,6 +11,5 @@
description A feed forward multi-layer neural network.
long_description ${description}
-checksums md5 a9780d6310ab194423807a2e46b32585 \
- sha1 a3bdd6914268f70dbfc8d30d001014cb8783861a \
- rmd160 df59efda0597d2eace9112c19ec036d3e907f65a
+checksums rmd160 9a2079012780ddac84fc383b19a5384a2bb0dfa4 \
+ sha256 e1388ea8f56bad0c609e879f2e19432d117111487cc6980ae78bb69cef48e41d
Modified: trunk/dports/math/octave-ocs/Portfile
===================================================================
--- trunk/dports/math/octave-ocs/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-ocs/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,13 +4,14 @@
PortGroup octave 1.0
-octave.setup ocs 0.0.4
+octave.setup ocs 0.1.3
platforms darwin
-license GPL-2
+license GPL-2+
maintainers nomaintainer
-description Package for solving DC and transient MNA equation stemming \
- from electrical circuit
+description Package for solving DC and transient \
+ electrical circuit equations.
long_description ${description}
-checksums md5 d2884ce53979b77d00e53eca7c1a789d \
- sha1 ab1f502c62c08f29992258225b58cedbc0cf10d6 \
- rmd160 d93e60fc0f40f373192f0ffca84c8733955e3508
+checksums rmd160 35c7e5816bcce3a19177bc5c846201cc23bd728f \
+ sha256 eb0e69b2bb498200947b598cd43181c49511d4df9acbaaeb14dd817719d55829
+
+depends_lib-append port:octave-odepkg
Modified: trunk/dports/math/octave-octcdf/Portfile
===================================================================
--- trunk/dports/math/octave-octcdf/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-octcdf/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,15 +4,15 @@
PortGroup octave 1.0
-octave.setup octcdf 1.0.13
-revision 1
+octave.setup octcdf 1.1.6
platforms darwin
-license GPL-2
+license GPL-2+
maintainers nomaintainer
-description A NetCDF interface for octave
+description A NetCDF interface for octave.
long_description ${description}
-checksums md5 318d8d3a6272ddbfef7f259dd3998013 \
- sha1 a74e9233f8309a7e39171aed552e8160eff04090 \
- rmd160 570cd84e7ddc833ff6850134c5e661afc2bae55d
+checksums rmd160 73be3273a4479a4b315384989b2601cc7957192b \
+ sha256 be7ba69ab0c130721a79395bb8217b9ffe939ac54df3201d63dc9bd84a480a51
depends_lib-append port:netcdf
+
+patchfiles-append patch-src_configure.diff
Added: trunk/dports/math/octave-octcdf/files/patch-src_configure.diff
===================================================================
--- trunk/dports/math/octave-octcdf/files/patch-src_configure.diff (rev 0)
+++ trunk/dports/math/octave-octcdf/files/patch-src_configure.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,11 @@
+--- src/configure.orig 2013-11-25 13:19:44.000000000 -0500
++++ src/configure 2013-11-25 13:19:51.000000000 -0500
+@@ -2997,7 +2997,7 @@
+ fi
+
+
+-OCTCDF_LIBS="$LDFLAGS"
++OCTCDF_LIBS=""
+ OCTCDF_CFLAGS="$CPPFLAGS"
+
+
Modified: trunk/dports/math/octave-odebvp/Portfile
===================================================================
--- trunk/dports/math/octave-odebvp/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-odebvp/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -7,11 +8,12 @@
platforms darwin
license GPL-2+
maintainers nomaintainer
-description To approximate the solution of the boundary-value problem \
- y''=p(x)*y' + q(x)*y + r(x), a<=x<=b, y(a)=alpha, \
- y(b)=beta by the linear finite-diffence method.
+description To approximate the solution of the \
+ boundary-value problem \
+ y''=p(x)*y' + q(x)*y + r(x), a<=x<=b, \
+ y(a)=alpha, y(b)=beta by the linear \
+ finite-diffence method.
long_description ${description}
-checksums md5 7ace0e26b6a4b1abed4959c73eeaf133 \
- sha1 c20253c62838c610c8da1b984554a5aa031262a1 \
- rmd160 f8542decb4d7e3b7852ceb806aa1310367de8c18
+checksums rmd160 f8542decb4d7e3b7852ceb806aa1310367de8c18 \
+ sha256 36f924e58d80b8f23852a1d4ef8486eba2975e6d20dd00bd4ce3307586eb3f67
Modified: trunk/dports/math/octave-odepkg/Portfile
===================================================================
--- trunk/dports/math/octave-odepkg/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-odepkg/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -4,17 +4,13 @@
PortSystem 1.0
PortGroup octave 1.0
-octave.setup odepkg 0.8.2
+octave.setup odepkg 0.8.4
platforms darwin
license GPL-2+
maintainers nomaintainer
-description An octave package for solving ordinary differential \
- equations and more.
+description An octave package for solving ordinary \
+ differential equations and more.
long_description ${description}
-checksums rmd160 22c5ee30ce74d7bb661c6ab61e75eb0858ba44d8 \
- sha256 c190f5ca3a1497ac8a39bcf71d5292729d9f6f285d9a078639faa77d02b31cff
-
-use_parallel_build no
-
-depends_build port:gsed
+checksums rmd160 ce21189ac2a57ee091f75af91e4eb68f43c6b317 \
+ sha256 77e99f082712c78ca4bcce389b786a6c8a546d0dc3b89bcced544518eb492cb8
Modified: trunk/dports/math/octave-optim/Portfile
===================================================================
--- trunk/dports/math/octave-optim/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-optim/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,14 +6,13 @@
octave.setup optim 1.2.2
platforms darwin
-license GPL-2+ GPL-3+
+license GFDL GPL-3+ BSD public-domain
maintainers nomaintainer
description Unconstrained Non-linear Optimization toolkit.
long_description ${description}
+checksums rmd160 7816d2c40d948485426b1f4340e0ed32427a4abf \
+ sha256 28b55e2aca3d28f655fe95644352b8bd2960f0d5809f0d64707499897248068c
+
depends_lib-append port:octave-miscellaneous \
port:octave-struct
-
-checksums md5 dce5e543c47ecc71ce0e8bb37994ed5d \
- sha1 c1fbd588dd11150ff4e973d4b93582c8bd6126ed \
- rmd160 7816d2c40d948485426b1f4340e0ed32427a4abf
Modified: trunk/dports/math/octave-optiminterp/Portfile
===================================================================
--- trunk/dports/math/octave-optiminterp/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-optiminterp/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,14 +4,14 @@
PortGroup octave 1.0
-octave.setup optiminterp 0.3.2
+octave.setup optiminterp 0.3.4
platforms darwin
-license GPL-2+
+license GPL-3+
maintainers nomaintainer
-description An optimal interpolation toolbox for octave. This package \
- provides functions to perform a n-dimensional optimal \
- interpolations of arbitrarily distributed data points.
+description An optimal interpolation toolbox for octave. \
+ This package provides functions to perform a \
+ n-dimensional optimal interpolations of \
+ arbitrarily distributed data points.
long_description ${description}
-checksums md5 d68ae8c3fdea03df953eb30790524220 \
- sha1 2f59d8cf5acda824fb09823ef27a6a109db0b4ec \
- rmd160 ccf8119ab8c05bb072bf45f1ddf1fd1ddc281794
+checksums rmd160 b9e9771c9fc9eb78c1500a0bba7870368ab44f44 \
+ sha256 483bfcfc282b76b36e70f293cae8209ee0e12b9eeb97b4fd9a837202bfd8f74a
Modified: trunk/dports/math/octave-outliers/Portfile
===================================================================
--- trunk/dports/math/octave-outliers/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-outliers/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -7,10 +8,9 @@
platforms darwin
license GPL-2+
maintainers nomaintainer
-description Grubbs, Dixon and Cochran tests for outlier detection and \
- p-value approximating routines.
+description Grubbs, Dixon, and Cochran tests for outlier \
+ detection and p-value approximating routines.
long_description ${description}
-checksums md5 d2829f19afccb01489caf2c1feee0d9f \
- sha1 3589598382fbddbb0771a54b90272be63bdd2e44 \
- rmd160 dcbac14d3a09b71828ee72d3de3598bfbfa52851
+checksums rmd160 dcbac14d3a09b71828ee72d3de3598bfbfa52851 \
+ sha256 075c69c4a1793c1fabc87fcc3ad69803faf9625c6d9c2dc8f9811969d0f68045
Modified: trunk/dports/math/octave-parallel/Portfile
===================================================================
--- trunk/dports/math/octave-parallel/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-parallel/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,12 +4,13 @@
PortGroup octave 1.0
-octave.setup parallel 2.0.0
+octave.setup parallel 2.0.5
platforms darwin
license GPL-2+ GPL-3+
maintainers nomaintainer
-description Parallel execution package for cluster computers
+description Parallel execution package for cluster computers.
long_description ${description}
-checksums md5 c46a96a79445d4581b929d2d02e941ef \
- sha1 f0bfde75c677cf4dca1a1a1dfa6c1233bc7bcb68 \
- rmd160 10556901eae3cfd57622f55aae06d7bea1c853c6
+checksums rmd160 b96a055e66bc86fbb571908c573f7ec3644c9a52 \
+ sha256 ca23168bc327d0dcdec3f349237b6813977236c6b1c1c45e560284247460cb1a
+
+patchfiles-append patch-add-unistd.h.diff
Added: trunk/dports/math/octave-parallel/files/patch-add-unistd.h.diff
===================================================================
--- trunk/dports/math/octave-parallel/files/patch-add-unistd.h.diff (rev 0)
+++ trunk/dports/math/octave-parallel/files/patch-add-unistd.h.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,42 @@
+--- src/connect.cc.orig 2013-11-25 16:15:09.000000000 -0500
++++ src/connect.cc 2013-11-25 16:15:31.000000000 -0500
+@@ -29,6 +29,7 @@
+ #include <errno.h>
+ #include <netdb.h>
+ #include <netinet/in.h> // reported necessary for FreeBSD-8
++#include <unistd.h>
+
+ #include "sock-stream.h"
+
+--- src/pserver.cc.orig 2013-11-25 16:15:09.000000000 -0500
++++ src/pserver.cc 2013-11-25 16:15:31.000000000 -0500
+@@ -34,6 +34,7 @@
+ #include <errno.h>
+ #include <netdb.h>
+ #include <netinet/in.h> // reported necessary for FreeBSD-8
++#include <unistd.h>
+
+ #include "sock-stream.h"
+
+--- src/recv.cc.orig 2013-11-25 16:15:09.000000000 -0500
++++ src/recv.cc 2013-11-25 16:15:31.000000000 -0500
+@@ -26,7 +26,7 @@
+ #include <sys/poll.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
+-
++#include <unistd.h>
+
+ DEFUN_DLD (recv, args, nargout, "recv (socket)\n\
+ \n\
+--- src/send.cc.orig 2013-11-25 16:15:09.000000000 -0500
++++ src/send.cc 2013-11-25 16:15:31.000000000 -0500
+@@ -25,7 +25,7 @@
+ #include <sys/poll.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
+-
++#include <unistd.h>
+
+ DEFUN_DLD (send, args, , "send (X, sockets)\n\
+ \n\
Modified: trunk/dports/math/octave-pdb/Portfile
===================================================================
--- trunk/dports/math/octave-pdb/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-pdb/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -7,10 +8,9 @@
platforms darwin
license GPL-2+
maintainers nomaintainer
-description Reads and display PDB-files from the Brookhaven protein \
- databank
+description Reads and display PDB-files from the \
+ Brookhaven protein databank.
long_description ${description}
-checksums md5 ff0f53e697849372199ff44ef0d95796 \
- sha1 720828be8c1671bae3d90d1939a5520d70a7bd56 \
- rmd160 f453f67d31fac2f7652084a880f3c3fe91a72a31
+checksums rmd160 f453f67d31fac2f7652084a880f3c3fe91a72a31 \
+ sha256 fe07e08ae7e41aa7a014f73cf7349c2d70030f05577e127e2e0e38171e0fa7b8
Modified: trunk/dports/math/octave-physicalconstants/Portfile
===================================================================
--- trunk/dports/math/octave-physicalconstants/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-physicalconstants/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,13 +4,14 @@
PortGroup octave 1.0
-octave.setup physicalconstants 0.1.7
+octave.setup physicalconstants 1.0.0
platforms darwin
-license GPL-2
+license GPL-3+
maintainers nomaintainer
-description Physical Constants from Atomic & Molecular Physics, taken \
- from NIST database
+description Physical Constants from Atomic and Molecular \
+ Physics, taken from NIST database.
long_description ${description}
-checksums md5 808a9c50a0e77cdf31e62c968d82d85b \
- sha1 58a3a4627de5b1c5a185ee1331aec1d310a05e01 \
- rmd160 8d5b85066e3f65f1e49cc723bf249c880e7d41a6
+checksums rmd160 4fad4b6e3aa1d07f445b066b54cb56e0e6f2d515 \
+ sha256 8cb5662970ccaf1f07955fe1781e4584fae163e68ba7c668690eb6e7a1368a16
+
+depends_lib-append port:octave-miscellaneous
Modified: trunk/dports/math/octave-plot/Portfile
===================================================================
--- trunk/dports/math/octave-plot/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-plot/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,12 +4,11 @@
PortGroup octave 1.0
-octave.setup plot 1.0.7
+octave.setup plot 1.1.0
platforms darwin
-license GPL-2+ GPL-3+
+license GPL-2+
maintainers nomaintainer
description Additional ploting tools for Octave.
long_description ${description}
-checksums md5 b740cf4b7818b17f84ffcebf80fe3dd1 \
- sha1 a0fa23a77791e7df90ba587c0ddbec62d16adfe1 \
- rmd160 421fa29e2448e150dec179f5ffc60f2ea1753dba
+checksums rmd160 8852b3a25627471d1a34bb8deb073380b0fd19d2 \
+ sha256 48350ee5f7de240148d5ea77f3ff428312878ca6c7d3b4259f067b294af24666
Modified: trunk/dports/math/octave-pt_br/Portfile
===================================================================
--- trunk/dports/math/octave-pt_br/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-pt_br/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,13 +4,21 @@
PortGroup octave 1.0
-octave.setup pt_br 1.0.8
+octave.setup pt_br 1.0.9
platforms darwin
license GPL-2+
maintainers nomaintainer
-description Brazilian Portuguese translations of the help strings of \
- the Octave functions.
+description Brazilian Portuguese translations of the \
+ help strings of the Octave functions. \
+ This module does not work with Octave 3.6 \
+ or newer\; this port is being deprecated.
long_description ${description}
-checksums md5 603b69e50932bc1c07f1376553c61cda \
- sha1 70ca95444a5c750461094988d7ee99170cd8a782 \
- rmd160 45c4e25dc3692a9ef599b41a8f066240d27c9210
+depends_build
+depends_lib
+depends_run
+
+pre-fetch {
+ ui_msg ""
+ ui_error "$name does not work with Octave 3.6 or newer.\n"
+ error "deprecated Octave module\n"
+}
Modified: trunk/dports/math/octave-secs1d/Portfile
===================================================================
--- trunk/dports/math/octave-secs1d/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-secs1d/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,12 +4,14 @@
PortGroup octave 1.0
-octave.setup secs1d 0.0.8
+octave.setup secs1d 0.0.9
platforms darwin
license GPL-2+
maintainers nomaintainer
-description A Drift-Diffusion simulator for 1d semiconductor devices
+description A Drift-Diffusion simulator for 1d \
+ semiconductor devices.
long_description ${description}
-checksums md5 597cb19b22ba2a4950dc957fd9aed526 \
- sha1 20cf4860848dc62c605232a7562ec451d03bb951 \
- rmd160 f33689353f0374b0d9e23bcbbb02b54e1f568239
+checksums rmd160 5890b3e82de3ee23f3be91e14795a11aa3d605f2 \
+ sha256 48a3ab03ff92478efe3c557144f5fb4b198ab6766f4e2a77a67683114c688aa8
+
+depends_lib-append port:octave-bim
Modified: trunk/dports/math/octave-signal/Portfile
===================================================================
--- trunk/dports/math/octave-signal/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-signal/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,17 +4,16 @@
PortGroup octave 1.0
-octave.setup signal 1.2.0
+octave.setup signal 1.2.2
platforms darwin
-license GPL-2+ GPL-3+
+license GPL-3+ public-domain
maintainers nomaintainer
-description Signal processing tools, including filtering, windowing \
- and display functions.
+description Signal processing tools, including filtering, \
+ windowing and display functions.
long_description ${description}
-depends_lib-append port:octave-optim \
- port:octave-control \
+checksums rmd160 2dff5e3e0d5c28f13d675fc9d5ce7990ed0d5604 \
+ sha256 3f1d63cc8c0a2cdc8a88718e029b09ae5c6b2cd173762720f8b5dc15cc20ad17
+
+depends_lib-append port:octave-control \
+ port:octave-general \
port:octave-specfun
-
-checksums md5 71487d316094759b6f58dab1aec75654 \
- sha1 87ed51b878ac49d32c328032500dff452132240b \
- rmd160 cd87b9f9f686cf2da7289f58a5bde8cf156204af
Modified: trunk/dports/math/octave-sockets/Portfile
===================================================================
--- trunk/dports/math/octave-sockets/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-sockets/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -2,12 +3,18 @@
PortGroup octave 1.0
+PortGroup compiler_blacklist_versions 1.0
-octave.setup sockets 1.0.5
+octave.setup sockets 1.0.8
platforms darwin
-license GPL-2
+license GPL-3+
maintainers nomaintainer
-description Socket functions
+description Socket functions.
long_description ${description}
-checksums md5 5272355a695a34f1ebffbeda701c2f0e \
- sha1 328356dfbb14557a774e905b446ba53688e123cd \
- rmd160 97e616b36b8c61649e65ecac6eb590a6c52469d1
+checksums rmd160 c1b8089ffd1553f508eca6f6bb1035b5e7879ef9 \
+ sha256 31411a11e0a31adb98e2e21343b858c8d5862eb5cc0eb0a56017a75dcefac4a6
+
+patchfiles-append patch-src_Makefile.diff
+
+depends_build-append port:gsed
+
+configure.env-append SED=${prefix}/bin/gsed
Added: trunk/dports/math/octave-sockets/files/patch-src_Makefile.diff
===================================================================
--- trunk/dports/math/octave-sockets/files/patch-src_Makefile.diff (rev 0)
+++ trunk/dports/math/octave-sockets/files/patch-src_Makefile.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,15 @@
+--- src/Makefile.orig 2013-11-15 11:26:55.000000000 -0500
++++ src/Makefile 2013-11-15 11:31:18.000000000 -0500
+@@ -3,9 +3,9 @@
+
+ #See which octave version we run by querying mkoctfile for its version
+ #string. (Is there a better way to do this? This looks horrible.)
+-majorversion := $(shell mkoctfile --version 2>&1 | sed -e 's/[ .+]/\n/g' |sed -n '3p')
+-minorversion := $(shell mkoctfile --version 2>&1 | sed -e 's/[ .+]/\n/g' |sed -n '4p')
+-microversion := $(shell mkoctfile --version 2>&1 | sed -e 's/[ .+]/\n/g' |sed -n '5p')
++majorversion := $(shell mkoctfile --version 2>&1 | $(SED) -e 's/[ .+]/\n/g' |sed -n '3p')
++minorversion := $(shell mkoctfile --version 2>&1 | $(SED) -e 's/[ .+]/\n/g' |sed -n '4p')
++microversion := $(shell mkoctfile --version 2>&1 | $(SED) -e 's/[ .+]/\n/g' |sed -n '5p')
+
+ VFLAGS=-DMAJORVERSION=$(majorversion)
+ VFLAGS+=-DMINORVERSION=$(minorversion)
Modified: trunk/dports/math/octave-specfun/Portfile
===================================================================
--- trunk/dports/math/octave-specfun/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-specfun/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,11 +6,11 @@
octave.setup specfun 1.1.0
platforms darwin
-license GPL-2+ GPL-3+
+license GPL-3+ BSD
maintainers nomaintainer
-description Special functions including ellipitic functions, etc
+description Special functions including ellipitic \
+ functions, etc.
long_description ${description}
-checksums md5 eef8c1ff37b05d5e3388ecedc045d53a \
- sha1 293a98dc2139057aa7119f3065d501616431c6a5 \
- rmd160 bf90f9568ad7a6f2b7d58c1738c2e977cc6343d8
+checksums rmd160 bf90f9568ad7a6f2b7d58c1738c2e977cc6343d8 \
+ sha256 d321650865db848df67a7161e8f82b5d49ab01eb8db2d5b5cce2cfab3467cb0f
Modified: trunk/dports/math/octave-special-matrix/Portfile
===================================================================
--- trunk/dports/math/octave-special-matrix/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-special-matrix/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,11 +6,10 @@
octave.setup special-matrix 1.0.7
platforms darwin
-license public-domain
+license GPL-2+
maintainers nomaintainer
description Additional Special Matrices for Octave.
long_description ${description}
-checksums md5 7dcd0154aca5fbb0de20628352c3dcfa \
- sha1 6c9f36a45071ecbb4c75d8084d3bee70652cd4f6 \
- rmd160 dfac40b0aa692dbf6221829ffac9f895bb0620b2
+checksums rmd160 dfac40b0aa692dbf6221829ffac9f895bb0620b2 \
+ sha256 1e936b5951343729f638f91172e7033491fdd03ab30bf9ee7529dc9c04780222
Modified: trunk/dports/math/octave-spline-gcvspl/Portfile
===================================================================
--- trunk/dports/math/octave-spline-gcvspl/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-spline-gcvspl/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -7,10 +8,14 @@
platforms darwin
license public-domain
maintainers nomaintainer
-description B-spline data smoothing using generalized cross-validation \
- and mean squared prediction or explicit user smoothing
+description B-spline data smoothing using generalized \
+ cross-validation and mean squared prediction \
+ or explicit user smoothing.
long_description ${description}
-checksums md5 cc09645ff71e45fc2789b2a563f1544b \
- sha1 83750b3309a68dac1746817368dc320acb4595b9 \
- rmd160 fd5a560ed9eac13d764b9c8278c63d4020074659
+checksums rmd160 fd5a560ed9eac13d764b9c8278c63d4020074659 \
+ sha256 ca0182643c03bcec7478c8d182c320b5bbe4c87e86cdeb3a654cd93146b59124
+
+# no longer exists on octave-forge
+
+livecheck.type none
Modified: trunk/dports/math/octave-splines/Portfile
===================================================================
--- trunk/dports/math/octave-splines/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-splines/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,12 +4,11 @@
PortGroup octave 1.0
-octave.setup splines 1.0.7
+octave.setup splines 1.2.5
platforms darwin
-license GPL-2+ public-domain
+license GPL-3+ public-domain
maintainers nomaintainer
description Additional Cubic spline functions.
long_description ${description}
-checksums md5 6fbe9bd3c8b8ee5199d3866599409b1b \
- sha1 f972b7224ed896e1bee8df3f41938dd01c488a0c \
- rmd160 f66e5c5b69b4f4aef67d00b0a412a63a21418dd5
+checksums rmd160 bf994e125b9366efd45ed94e34b979c4e7b1ec19 \
+ sha256 5b2cafc39e94c78a6186d422784a8ed253c427bc5b06525be045c7729978b641
Modified: trunk/dports/math/octave-statistics/Portfile
===================================================================
--- trunk/dports/math/octave-statistics/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-statistics/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,12 +4,13 @@
PortGroup octave 1.0
-octave.setup statistics 1.0.9
+octave.setup statistics 1.2.2
platforms darwin
-license GPL-2+ GPL-3+ public-domain
+license GPL-3+ public-domain
maintainers nomaintainer
description Additional statistics functions for Octave.
long_description ${description}
-checksums md5 e0b7f32ce2854e3de7d032cc9e9e6dbc \
- sha1 45763558c7b57d41c4b36f0c715770c9d3d5e6bc \
- rmd160 3f5895975e4fe45c2bd32567400547dc73754163
+checksums rmd160 da7444c63d986ce59b37368a384f8deb9ca15005 \
+ sha256 87219eeff132657952579044bca84e85e39c9c4a699dc2d5d51a86fc40d06be2
+
+depends_lib-append port:octave-io
Modified: trunk/dports/math/octave-strings/Portfile
===================================================================
--- trunk/dports/math/octave-strings/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-strings/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,12 +4,15 @@
PortGroup octave 1.0
-octave.setup strings 1.0.7
+octave.setup strings 1.1.0
platforms darwin
-license GPL-2+ BSD public-domain
+license GPL-3+ BSD public-domain
maintainers nomaintainer
-description Additional manipulation functions
+description Additional manipulation functions.
long_description ${description}
-checksums md5 0b360fc1db30daf8e74db85548aad0fb \
- sha1 ab6a49f72b925cba7a5b3e8bf5fc5850484abc42 \
- rmd160 a33812368f8f257f0646fe5499cbf9d55cba312c
+checksums rmd160 72b39a0621774b1f2428f02f0d22b174446fd18e \
+ sha256 068df2b39d938c530a4d9f8ffefa4735f5bb64b1bc1d05957b1f2d7566309d68
+
+depends_lib-append port:pcre
+
+patchfiles patch-src_Makefile.diff
Added: trunk/dports/math/octave-strings/files/patch-src_Makefile.diff
===================================================================
--- trunk/dports/math/octave-strings/files/patch-src_Makefile.diff (rev 0)
+++ trunk/dports/math/octave-strings/files/patch-src_Makefile.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,14 @@
+--- src/Makefile.orig 2013-11-16 14:53:44.000000000 -0500
++++ src/Makefile 2013-11-16 14:54:01.000000000 -0500
+@@ -1,9 +1,9 @@
+-MKOCTFILE = mkoctfile -Wall
++MKOCTFILE = mkoctfile -Wall -verbose
+
+ all: pcregexp.oct
+
+ %.oct: %.cc
+- $(MKOCTFILE) $<
++ $(MKOCTFILE) -lpcre $<
+
+ clean:
+ rm -f *.o octave-core core *.oct *~
Modified: trunk/dports/math/octave-struct/Portfile
===================================================================
--- trunk/dports/math/octave-struct/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-struct/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,11 +6,10 @@
octave.setup struct 1.0.10
platforms darwin
-license GPL-2+ GPL-3+
+license GPL-3+
maintainers nomaintainer
description Additional Structure manipulations functions.
long_description ${description}
-checksums md5 6531dbadbadd86b79b74ca86b6d39c9e \
- sha1 4703b20612c9e5ec48765af15c28e7a1fc90d427 \
- rmd160 dca73a23067fb9f8c35cc9cb9250e297cee7639c
+checksums rmd160 dca73a23067fb9f8c35cc9cb9250e297cee7639c \
+ sha256 033c2a3cc0ec92668f3ac09b7bf14c816e7a4921901ed9421d30af7da9d3308c
Modified: trunk/dports/math/octave-symband/Portfile
===================================================================
--- trunk/dports/math/octave-symband/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-symband/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -10,6 +11,5 @@
description Linear Algebra for Symmetric Banded Matrices.
long_description ${description}
-checksums md5 3744cbef41294e517e78c8fc8265bb3e \
- sha1 c66738992c661f70865cf524e76b82e3a73455bb \
- rmd160 e21138ccca45d33986ca2ce58f930739030ec504
+checksums rmd160 e21138ccca45d33986ca2ce58f930739030ec504 \
+ sha256 2149ec9a7422e5b2d8f66ea0bcd6a2820bd6625e345e0719320d29874530c4c5
Modified: trunk/dports/math/octave-tcl-octave/Portfile
===================================================================
--- trunk/dports/math/octave-tcl-octave/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-tcl-octave/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -7,9 +8,8 @@
platforms darwin
license public-domain
maintainers nomaintainer
-description socket implementation of a tcl-octave connection
+description socket implementation of a tcl-octave connection.
long_description ${description}
-checksums md5 a98faee2560360e6282f153f185995bf \
- sha1 e4d32b7b38bb5978e39374d207d3977d0a739b3e \
- rmd160 d7b4f7f40638bd99e195e6fc65157ef4c869c5d6
+checksums rmd160 d7b4f7f40638bd99e195e6fc65157ef4c869c5d6 \
+ sha256 cb5e6bd8eaac92c3ab1777c51c9e619f2c3bc57d25eb662f66f3f77079856df4
Modified: trunk/dports/math/octave-time/Portfile
===================================================================
--- trunk/dports/math/octave-time/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-time/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,12 +4,14 @@
PortGroup octave 1.0
-octave.setup time 1.0.9
+octave.setup time 2.0.0
platforms darwin
-license GPL-2+ GPL-3+
+license GPL-3+
maintainers nomaintainer
-description Additional date manipulation tools.
+description Additional date manipulation tools. This a dummy \
+ package as transition for the financial package.
long_description ${description}
-checksums md5 333d00919b63959aa5f345f134c01c5e \
- sha1 6f37ce459fdcf2667847cc046266cddbaa0d6528 \
- rmd160 64ff0fcf0f07c185d77b1e9682857e960a7922ec
+checksums rmd160 5185862d3501b9d9608fe4d7c562de2a83552ba7 \
+ sha256 e42609d24b7498d1ed6753dd597f62ae8f9488b094e24ecf7b0e2b366f15c5c3
+
+depends_lib-append port:octave-financial
Modified: trunk/dports/math/octave-tsa/Portfile
===================================================================
--- trunk/dports/math/octave-tsa/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-tsa/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,15 +4,14 @@
PortGroup octave 1.0
-octave.setup tsa 4.0.1
+octave.setup tsa 4.2.4
platforms darwin
license GPL-3+
maintainers nomaintainer
-description Stochastic concepts and maximum entropy methods for time \
- series analysis
+description Stochastic concepts and maximum entropy \
+ methods for time series analysis.
long_description ${description}
-checksums md5 ba9d4b039a8644c50708fa93db3bac97 \
- sha1 4ba2e205bb1834b9d15c0b85a3098906c00f9288 \
- rmd160 4c6a5e5b7f815917f0b085c38ea9f2e945ffe419
+checksums rmd160 425d30d9b11e79eb25758418360da53ddcb5a09b \
+ sha256 b542119a27313c0136bca436be679f6711ff8943130f1231c0c93960c45e6b23
-depends_lib-append port:octave-nan
+patchfiles patch-src_Makefile.diff
Added: trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff
===================================================================
--- trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff (rev 0)
+++ trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff 2013-11-27 16:20:17 UTC (rev 114034)
@@ -0,0 +1,29 @@
+--- src/Makefile.orig 2013-11-16 14:58:41.000000000 -0500
++++ src/Makefile 2013-11-16 15:02:58.000000000 -0500
+@@ -35,7 +35,12 @@
+ RM = rm
+
+ MEX_OPTION += -lgomp CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
+-MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION)
++MKOCTFILE = mkoctfile$(OCTAVE_VERSION)
++OCTMEX = $(MKOCTFILE) --mex
++
++FLIBS = ${shell $(MKOCTFILE) -p FLIBS}
++INCFLAGS = ${shell $(MKOCTFILE) -p INCFLAGS}
++INC_CSTDLIB = -include cstdlib
+
+ PROGS = covm_mex.mex sumskipnan_mex.mex
+
+@@ -58,10 +63,10 @@
+ # Octave, MATLAB on Linux
+ #########################################################
+ %.oct: %.cc
+- mkoctfile$(OCTAVE_VERSION) $<
++ $(MKOCTFILE) $<
+
+ %.mex: %.cpp
+- $(OCTMEX) $< -lgomp ## Octave
++ INCFLAGS="$(INCFLAGS) $(INC_CSTDLIB)" $(OCTMEX) $< $(FLIBS) -lgomp
+ %.$(MEX_EXT): %.cpp
+ $(MATMEX) $< -lgomp ## Matlab
+
Modified: trunk/dports/math/octave-vrml/Portfile
===================================================================
--- trunk/dports/math/octave-vrml/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-vrml/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -5,12 +6,15 @@
octave.setup vrml 1.0.13
platforms darwin
-license GPL-3+
+license GPL-3+ GFDL
maintainers nomaintainer
-description 3D graphics using VRML
+description 3D graphics using VRML.
long_description ${description}
checksums rmd160 c07aa8303d29ccdee00c92271088dd9bc3c11267 \
sha256 c45357d47382b22a37dded72888c34a3839ff608baedbfea11ed2950c21ca9d7
-worksrcdir vrml
+depends_lib-append port:octave-linear-algebra \
+ port:octave-miscellaneous \
+ port:octave-struct \
+ port:octave-statistics
Modified: trunk/dports/math/octave-windows/Portfile
===================================================================
--- trunk/dports/math/octave-windows/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-windows/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,13 +4,12 @@
PortGroup octave 1.0
-octave.setup windows 1.0.8
+octave.setup windows 1.2.1
platforms darwin
license GPL-2+
maintainers nomaintainer
-description Provides COM interface and additional functionality on \
- Windows
+description Provides COM interface and additional \
+ functionality on Windows.
long_description ${description}
-checksums md5 b0701380de37f98ac9daaa9418015d6e \
- sha1 413bde63ba9110bc34fd8f065af09ad9bc9d5227 \
- rmd160 6b6d6fde40a2fd37ae90e6dc27b2421dd000ff3c
+checksums rmd160 c3488bc84d86faabf57087591ba3752e5bdf58e8 \
+ sha256 36dac65fcd6d138d7b3e8ee76aeb989ab3e7158407ed13b10f9322c6ec6706e0
Modified: trunk/dports/math/octave-zenity/Portfile
===================================================================
--- trunk/dports/math/octave-zenity/Portfile 2013-11-27 16:04:36 UTC (rev 114033)
+++ trunk/dports/math/octave-zenity/Portfile 2013-11-27 16:20:17 UTC (rev 114034)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -9,15 +10,15 @@
maintainers nomaintainer
license GPL-2+
supported_archs noarch
-
-description A set of functions for creating simple graphical user \
- interfaces. It is currently possible to create calendar \
- windows, text entries, file selection dialogs, lists, \
- message windows, icons in the notification area, and \
- windows for large amount of text.
+description A set of functions for creating simple graphical \
+ user interfaces. It is currently possible to \
+ create calendar windows, text entries, file \
+ selection dialogs, lists, message windows, icons \
+ in the notification area, and windows for large \
+ amount of text.
long_description ${description}
-checksums sha1 bc24b583385a3d4d6f438361334be530e38752c7 \
- rmd160 f4c7eeacbdc5a0de24398fd09b1b39d9fb42bd83
+checksums rmd160 f4c7eeacbdc5a0de24398fd09b1b39d9fb42bd83 \
+ sha256 cd1a6fe127b4a96f18cc25a4981537a279ad8f1b877287049b11d9afd2a0bd59
depends_lib-append port:zenity
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131127/fa7bbbb3/attachment-0001.html>
More information about the macports-changes
mailing list