kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to 1.4. The only change is to call octave-cli instead of octave.

Browse source
This commit is contained in:
Stephen Montgomery-Smith 2016-01-13 01:19:33 +00:00
parent 848139fcb9
commit d0e31d59aa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=405979
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
math/octave-forge-base/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= octave-forge-base
PORTVERSION= 1.3
PORTVERSION= 1.4
CATEGORIES= math
MASTER_SITES= #none
DISTFILES= #none

8
math/octave-forge-base/files/load-octave-pkg.in
View file

@ -17,7 +17,7 @@ use File::Remove qw(remove);
# Interrogate octave to see where it stores its packages.
open(OCTAVE,"octave -H -q --no-site-file --eval \"pkg('prefix');pkg('global_list')\" |") || die;
open(OCTAVE,"octave-cli -H -q --no-site-file --eval \"pkg('prefix');pkg('global_list')\" |") || die;
my $install_prefix = <OCTAVE> || die;
chomp $install_prefix;
$install_prefix =~ s/.*\s+//;
@ -76,7 +76,7 @@ while (my $p = <$install_prefix/*>) {
# out everything.
my %check_installed;
open(OCTAVE,"octave -H -q --no-site-file --eval \"pkg('list')\" |") || die;
open(OCTAVE,"octave-cli -H -q --no-site-file --eval \"pkg('list')\" |") || die;
<OCTAVE>;
my $out = join "",<OCTAVE>;
while ($out =~ s/^\s*(\S+)\s*\|\s*(\S+).*$//m) {
@ -158,7 +158,7 @@ if ($nr_to_remove>0) {
foreach my $p (@ordered_list_to_remove) {
print "load-octave-pkg: octave is uninstalling $p.\n";
$p =~ s/\-[\d\.]+\.tar\.gz//;
system "octave -H -q --no-site-file --eval \"pkg('uninstall','$p')\" > /dev/null";
system "octave-cli -H -q --no-site-file --eval \"pkg('uninstall','$p')\" > /dev/null";
}
}
@ -238,7 +238,7 @@ make_ordered_list_to_install(join("|",sort keys %to_install));
foreach my $p (@ordered_list_to_install) {
print "load-octave-pkg: octave is installing $p.\n";
system "octave -H -q --no-site-file --eval \"pkg('install','$tardir/$p')\" > /dev/null\n";
system "octave-cli -H -q --no-site-file --eval \"pkg('install','$tardir/$p')\" > /dev/null\n";
}
# Remove directories that may have been left behind by the octave packaging