diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2008-02-27 03:24:46 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2008-02-27 03:24:46 +0000 |
| commit | 4326f253fb3e1aa0dd63630ae2dd52909d126422 (patch) | |
| tree | d2cf7503fa5ec5cb4dc99bea7b33b3b7d697beed /math | |
| parent | - Update to 1.1.5 (diff) | |
Since bsdtar can detect the type of file it's extracting, simplify
handling of compressed tarballs and zip files.
Approved by: maho (maintainer)
Notes
Notes:
svn path=/head/; revision=207975
Diffstat (limited to 'math')
| -rw-r--r-- | math/octave/Makefile | 2 | ||||
| -rw-r--r-- | math/octave/files/patch-scripts+miscellaneous+unpack.m | 37 |
2 files changed, 26 insertions, 13 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index bdb96cd9569a..68babf8b240b 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -7,7 +7,7 @@ PORTNAME= octave PORTVERSION= 3.0.0 -PORTREVISION= 2 +PORTREVISION= 3 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 index 5dfdd9675492..204836c42372 100644 --- a/math/octave/files/patch-scripts+miscellaneous+unpack.m +++ b/math/octave/files/patch-scripts+miscellaneous+unpack.m @@ -1,19 +1,32 @@ ---- 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 @@ + +$FreeBSD$ + +--- scripts/miscellaneous/unpack.m.orig ++++ scripts/miscellaneous/unpack.m +@@ -124,19 +124,13 @@ 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; +- @__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; +- @__parse_tar__, false}; +- commandlist.tarbz = commandlist.tarbz2; +- commandlist.tbz2 = commandlist.tarbz2; +- commandlist.tbz = commandlist.tarbz2; +- commandlist.zip = {"unzip \"%s\"", ... +- "unzip -q \"%s\"", ... +- @__parse_zip__, false}; ++ commandlist.targz = commandlist.tar; ++ commandlist.tgz = commandlist.tar; ++ commandlist.tarbz2 = commandlist.tar; ++ commandlist.tarbz = commandlist.tar; ++ commandlist.tbz2 = commandlist.tar; ++ commandlist.tbz = commandlist.tar; ++ commandlist.zip = commandlist.tar; + endif + + nodotext = ext(! ismember (ext, ".")); |