cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- in the unpack function, add missing -f argument to tar invocations

Browse Source 
- in the pkg function, use gmake instead of make, since all the octave-forge
stuff uses it; add corresponding runtime dependency on gmake

based on a diff from Paul Irofti (bulibuta at gmail)
This commit is contained in:
steven 2007-11-10 11:15:05 +00:00
parent 983a18fd97
commit 40d19078bc
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
math/octave/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2007/09/23 08:06:59 steven Exp $
# $OpenBSD: Makefile,v 1.30 2007/11/10 11:15:05 steven Exp $
# vax: no IEEE arithmetic
# sparc: fPIC version of libgcc.a needed but not available
@ -8,6 +8,7 @@ COMMENT= high-level language for numerical computations
VERSION= 2.9.14
DISTNAME= octave-${VERSION}
PKGNAME= ${DISTNAME}p0
CATEGORIES= math
SHARED_LIBS= cruft 5.0 \
@ -31,6 +32,7 @@ MASTER_SITES= ftp://ftp.octave.org/pub/octave/bleeding-edge/ \
ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/bleeding-edge/
BUILD_DEPENDS= ::devel/desktop-file-utils
RUN_DEPENDS= ::devel/gmake
LIB_DEPENDS= fftw3.>=3::math/fftw3 \
lapack.>=3::math/lapack \
blas.>=1::math/blas \

20
math/octave/patches/patch-scripts_miscellaneous_unpack_m Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-scripts_miscellaneous_unpack_m,v 1.1 2007/11/10 11:15:05 steven Exp $
--- scripts/miscellaneous/unpack.m.orig Sat Nov 10 12:11:03 2007
+++ scripts/miscellaneous/unpack.m Sat Nov 10 12:11:10 2007
@@ -125,12 +125,12 @@ function filelist = unpack (file, directory, filetype)
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;

12
math/octave/patches/patch-scripts_pkg_pkg_m Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-scripts_pkg_pkg_m,v 1.1 2007/11/10 11:15:05 steven Exp $
--- scripts/pkg/pkg.m.orig Sat Nov 10 12:10:44 2007
+++ scripts/pkg/pkg.m Sat Nov 10 12:10:52 2007
@@ -996,7 +996,7 @@ function configure_make (desc, packdir, verbose)
## 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);