From c159e4e8e50f77ff7faa924ea645fdec0f88b4b3 Mon Sep 17 00:00:00 2001
From: Stephen Montgomery-Smith <stephen@FreeBSD.org>
Date: Sun, 15 Nov 2020 00:09:07 +0000
Subject: [PATCH] - Update to 1.5.   Add '-W' option to octave-cli so that
 octave-cli does not attempt to   contact the X11 server.

---
 math/octave-forge-base/Makefile                 | 3 +--
 math/octave-forge-base/files/load-octave-pkg.in | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/math/octave-forge-base/Makefile b/math/octave-forge-base/Makefile
index c12eb6c54054..bb223c52f13e 100644
--- a/math/octave-forge-base/Makefile
+++ b/math/octave-forge-base/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	octave-forge-base
-PORTVERSION=	1.4
-PORTREVISION=	6
+PORTVERSION=	1.5
 CATEGORIES=	math
 MASTER_SITES=	#none
 DISTFILES=	#none
diff --git a/math/octave-forge-base/files/load-octave-pkg.in b/math/octave-forge-base/files/load-octave-pkg.in
index 20839ef748fb..acaf31090002 100644
--- a/math/octave-forge-base/files/load-octave-pkg.in
+++ b/math/octave-forge-base/files/load-octave-pkg.in
@@ -17,7 +17,7 @@ use File::Remove qw(remove);
 
 # 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;
 chomp $install_prefix;
 $install_prefix =~ s/.*\s+//;
@@ -76,7 +76,7 @@ while (my $p = <$install_prefix/*>) {
 # out everything.
 
 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>;
 my $out = join "",<OCTAVE>;
 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) {
     print "load-octave-pkg: octave is uninstalling $p.\n";
     $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) {
   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