sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 1.5.

Browse source 
Add '-W' option to octave-cli so that octave-cli does not attempt to
  contact the X11 server.
This commit is contained in:
Stephen Montgomery-Smith 2020-11-15 00:09:07 +00:00
parent e501b52ded
commit c159e4e8e5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=555153
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= octave-forge-base PORTNAME= octave-forge-base
PORTVERSION= 1.4 PORTVERSION= 1.5
PORTREVISION= 6
CATEGORIES= math CATEGORIES= math
MASTER_SITES= #none MASTER_SITES= #none
DISTFILES= #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. # Interrogate octave to see where it stores its packages.
open(OCTAVE,"octave-cli -H -q --no-site-file --eval \"pkg('prefix');pkg('global_list')\" |") || die; open(OCTAVE,"octave-cli -W -H -q --no-site-file --eval \"pkg('prefix');pkg('global_list')\" |") || die;
my $install_prefix = <OCTAVE> || die; my $install_prefix = <OCTAVE> || die;
chomp $install_prefix; chomp $install_prefix;
$install_prefix =~ s/.*\s+//; $install_prefix =~ s/.*\s+//;
@ -76,7 +76,7 @@ while (my $p = <$install_prefix/*>) {
# out everything. # out everything.
my %check_installed; my %check_installed;
open(OCTAVE,"octave-cli -H -q --no-site-file --eval \"pkg('list')\" |") || die; open(OCTAVE,"octave-cli -W -H -q --no-site-file --eval \"pkg('list')\" |") || die;
<OCTAVE>; <OCTAVE>;
my $out = join "",<OCTAVE>; my $out = join "",<OCTAVE>;
while ($out =~ s/^\s*(\S+)\s*\|\s*(\S+).*$//m) { while ($out =~ s/^\s*(\S+)\s*\|\s*(\S+).*$//m) {
@ -159,7 +159,7 @@ if ($nr_to_remove>0) {
foreach my $p (@ordered_list_to_remove) { foreach my $p (@ordered_list_to_remove) {
print "load-octave-pkg: octave is uninstalling $p.\n"; print "load-octave-pkg: octave is uninstalling $p.\n";
$p =~ s/\-[\d\.]+\.tar\.gz//; $p =~ s/\-[\d\.]+\.tar\.gz//;
system "octave-cli -H -q --no-site-file --eval \"pkg('uninstall','$p')\" > /dev/null"; system "octave-cli -W -H -q --no-site-file --eval \"pkg('uninstall','$p')\" > /dev/null";
} }
} }
@ -240,7 +240,7 @@ make_ordered_list_to_install(join("|",sort keys %to_install));
foreach my $p (@ordered_list_to_install) { foreach my $p (@ordered_list_to_install) {
print "load-octave-pkg: octave is installing $p.\n"; print "load-octave-pkg: octave is installing $p.\n";
system "octave-cli -H -q --no-site-file --eval \"pkg('install','$tardir/$p')\" > /dev/null\n"; system "octave-cli -W -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 # Remove directories that may have been left behind by the octave packaging