Revision: 138162 https://trac.macports.org/changeset/138162 Author: michaelld@macports.org Date: 2015-06-30 12:28:15 -0700 (Tue, 30 Jun 2015) Log Message: ----------- octave-stk: + update to 2.3.1, which addresses ticket #48137; + add patches to fix loading and unloading by not creating the PKG* files, and to correct the DESCRIPTION. Modified Paths: -------------- trunk/dports/math/octave-stk/Portfile Added Paths: ----------- trunk/dports/math/octave-stk/files/ trunk/dports/math/octave-stk/files/patch-DESCRIPTION.diff trunk/dports/math/octave-stk/files/patch-inst_stk_init.m.diff Modified: trunk/dports/math/octave-stk/Portfile =================================================================== --- trunk/dports/math/octave-stk/Portfile 2015-06-30 19:17:19 UTC (rev 138161) +++ trunk/dports/math/octave-stk/Portfile 2015-06-30 19:28:15 UTC (rev 138162) @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup octave 1.0 -octave.setup stk 2.2.0 +octave.setup stk 2.3.1 platforms darwin license GPL-2+ maintainers gmail.com:mschamschula openmaintainer @@ -19,5 +19,22 @@ STK can be useful for other applications areas (such as \ Geostatistics, Machine Learning, Non-parametric Regression, etc.). -checksums rmd160 cf7ac2145e72afa9f398c59403b1992b5f73bf06 \ - sha256 ed87e64a4ed3bdb6a27369b6b3e1c8e4d5778831c945e37d8ead52b257c3a5af +checksums rmd160 f520ccaccc7d3774c7658dd9e4d3ccf08c0ecf18 \ + sha256 b64705ebd8ebbdc7e322c854fdb8c3a8d3e124b0ca109619c8673016510005b5 + +# fix the DESCRIPTION to specify the Octave version & to not autoload + +patchfiles-append patch-DESCRIPTION.diff + +# "mkoctfile" is parsing the file "inst/stk_init.m" & creating the +# PKG* files automagically. These files are executed when the package +# is loaded or unloaded, and result in failure at that point. Removing +# the lines for PKG* keeps mkoctfile from creating those files. +# +# See also: +# https://trac.macports.org/ticket/47478 +# https://trac.macports.org/ticket/48137 +# +# This fix is for this port only, not in general. + +patchfiles-append patch-inst_stk_init.m.diff Added: trunk/dports/math/octave-stk/files/patch-DESCRIPTION.diff =================================================================== --- trunk/dports/math/octave-stk/files/patch-DESCRIPTION.diff (rev 0) +++ trunk/dports/math/octave-stk/files/patch-DESCRIPTION.diff 2015-06-30 19:28:15 UTC (rev 138162) @@ -0,0 +1,10 @@ +--- DESCRIPTION.orig 2015-05-18 12:26:58.000000000 -0400 ++++ DESCRIPTION 2015-05-18 12:27:24.000000000 -0400 +@@ -22,3 +22,7 @@ + Machine Learning, Non-parametric Regression, etc.). + # + Url: https://sourceforge.net/projects/kriging/ ++# ++Depends: octave (>= 3.8.2) ++# ++Autoload: no Added: trunk/dports/math/octave-stk/files/patch-inst_stk_init.m.diff =================================================================== --- trunk/dports/math/octave-stk/files/patch-inst_stk_init.m.diff (rev 0) +++ trunk/dports/math/octave-stk/files/patch-inst_stk_init.m.diff 2015-06-30 19:28:15 UTC (rev 138162) @@ -0,0 +1,13 @@ +--- inst/stk_init.m.orig 2015-06-30 15:10:01.000000000 -0400 ++++ inst/stk_init.m 2015-06-30 15:10:22.000000000 -0400 +@@ -32,10 +32,6 @@ + % You should have received a copy of the GNU General Public License + % along with STK. If not, see <http://www.gnu.org/licenses/>. + +-%% PKG_ADD: stk_init (); +- +-%% PKG_DEL: stk_init (true); +- + function stk_init (do_quit) + + % Deduce the root of STK from the path to this script