diff options
| author | stephen <stephen@FreeBSD.org> | 2014-05-18 03:34:49 +0800 |
|---|---|---|
| committer | stephen <stephen@FreeBSD.org> | 2014-05-18 03:34:49 +0800 |
| commit | 6f5222e15b7720a2611ff345cc40f79524baad42 (patch) | |
| tree | 2806aff116911b0e5e7b1c9771cce734cbb72d46 /math | |
| parent | 13ff9667ffa79356e8512a844298ce97ecfffaf2 (diff) | |
| download | freebsd-ports-gnome-6f5222e15b7720a2611ff345cc40f79524baad42.tar.gz freebsd-ports-gnome-6f5222e15b7720a2611ff345cc40f79524baad42.tar.zst freebsd-ports-gnome-6f5222e15b7720a2611ff345cc40f79524baad42.zip | |
- Make clang compliant.
- Bump portrevision.
Diffstat (limited to 'math')
| -rw-r--r-- | math/octave-forge-miscellaneous/Makefile | 2 | ||||
| -rw-r--r-- | math/octave-forge-miscellaneous/files/patch-partarray.cc | 47 |
2 files changed, 48 insertions, 1 deletions
diff --git a/math/octave-forge-miscellaneous/Makefile b/math/octave-forge-miscellaneous/Makefile index 1a8cc8d7518c..9504541bc57b 100644 --- a/math/octave-forge-miscellaneous/Makefile +++ b/math/octave-forge-miscellaneous/Makefile @@ -3,7 +3,7 @@ PORTNAME= octave-forge-miscellaneous PORTVERSION= 1.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/octave-forge-miscellaneous/files/patch-partarray.cc b/math/octave-forge-miscellaneous/files/patch-partarray.cc new file mode 100644 index 000000000000..417863ab1447 --- /dev/null +++ b/math/octave-forge-miscellaneous/files/patch-partarray.cc @@ -0,0 +1,47 @@ +--- partarray.cc.orig 2012-03-24 14:53:23.000000000 -0500 ++++ partarray.cc 2014-05-17 13:05:40.000000000 -0500 +@@ -39,9 +39,12 @@ + 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]; + // + Array<octave_idx_type> step (dim_vector (maxdims, 1)); ++ // Array<octave_idx_type> bidc [maxdims], eidc [maxdims]; ++ Array<octave_idx_type> *bidc, *eidc; ++ bidc = new Array<octave_idx_type> [maxdims]; ++ eidc = new Array<octave_idx_type> [maxdims]; + step(0) = 1; + for (int i = 0; i < maxdims; i++) + { +@@ -62,6 +65,8 @@ + { + error ("%s: argument %i: wrong dimensions", + fname.c_str (), i + 2); ++ delete(bidc); ++ delete(eidc); + return Cell (); + } + cnidx = +@@ -83,8 +88,11 @@ + if (i < maxdims - 1) + step(i + 1) = step(i) * alldims(i); + } +- if (error_state) ++ if (error_state) { ++ delete(bidc); ++ delete(eidc); + return Cell (); ++ } + + dim_vector rdv (nc, 1); + +@@ -144,6 +152,8 @@ + } + } + ++ delete(bidc); ++ delete(eidc); + return retval; + } + |