diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2008-02-27 02:23:12 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2008-02-27 02:23:12 +0000 |
| commit | c208346f139257d0cbc457490bf9b5289f973124 (patch) | |
| tree | 73b79f674674405ae9103e4208d7b96ffbdd65bc /math | |
| parent | update to 0.9.2 (diff) | |
1. FreeBSD tar requires extra switches to read the archive from stdin.
2. Fix installation of packages from octave-forge. make is not GNU make.
3. Bump portrevision accordingly.
Submitted by: Ryan Hinton <rwh4s@virginia.edu>
Notes
Notes:
svn path=/head/; revision=207971
Diffstat (limited to 'math')
| -rw-r--r-- | math/octave/Makefile | 2 | ||||
| -rw-r--r-- | math/octave/files/patch-scripts+miscellaneous+unpack.m | 19 | ||||
| -rw-r--r-- | math/octave/files/patch-scripts+pkg+pkg.m | 11 |
3 files changed, 31 insertions, 1 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index 33a2fe5a0ae9..bdb96cd9569a 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -7,7 +7,7 @@ PORTNAME= octave PORTVERSION= 3.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= ftp://ftp.octave.org/pub/octave/ \ ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/bleeding-edge/ diff --git a/math/octave/files/patch-scripts+miscellaneous+unpack.m b/math/octave/files/patch-scripts+miscellaneous+unpack.m new file mode 100644 index 000000000000..5dfdd9675492 --- /dev/null +++ b/math/octave/files/patch-scripts+miscellaneous+unpack.m @@ -0,0 +1,19 @@ +--- scripts/miscellaneous/unpack.m.orig 2007-10-13 06:27:23.000000000 +0900 ++++ scripts/miscellaneous/unpack.m 2008-02-27 11:17:04.000000000 +0900 +@@ -124,12 +124,12 @@ + commandlist.tar = {"tar -x -v -f \"%s\"", ... + "tar -x -f \"%s\"", ... + @__parse_tar__, false}; +- commandlist.targz = {"gzip -d -c \"%s\" | tar -x -v", ... +- "gzip -d -c \"%s\" | tar -x", ... ++ commandlist.targz = {"gzip -d -c \"%s\" | tar -x -v -f - ", ... ++ "gzip -d -c \"%s\" | tar -x -f - ", ... + @__parse_tar__, false}; + commandlist.tgz = commandlist.targz; +- commandlist.tarbz2 = {"bzip2 -d -c \"%s\" | tar -x -v", ... +- "bzip2 -d -c \"%s\" | tar -x", ... ++ commandlist.tarbz2 = {"bzip2 -d -c \"%s\" | tar -x -v -f - ", ... ++ "bzip2 -d -c \"%s\" | tar -x -f - ", ... + @__parse_tar__, false}; + commandlist.tarbz = commandlist.tarbz2; + commandlist.tbz2 = commandlist.tarbz2; diff --git a/math/octave/files/patch-scripts+pkg+pkg.m b/math/octave/files/patch-scripts+pkg+pkg.m new file mode 100644 index 000000000000..c4b0030fe524 --- /dev/null +++ b/math/octave/files/patch-scripts+pkg+pkg.m @@ -0,0 +1,11 @@ +--- scripts/pkg/pkg.m~ 2007-12-20 16:55:26.000000000 +0000 ++++ scripts/pkg/pkg.m 2008-02-25 16:32:59.000000000 +0000 +@@ -1052,7 +1052,7 @@ + ## make + if (exist (fullfile (src, "Makefile"), "file")) + [status, output] = shell (strcat ("export INSTALLDIR=\"", desc.dir, +- "\"; make -C ", src)); ++ "\"; gmake -C ", src)); + if (status != 0) + rm_rf (desc.dir); + error ("'make' returned the following error: %s", output); |