6 files changed, 11 insertions, 29 deletions
diff --git a/math/octave/files/patch-build-aux_find-defun-files.sh b/math/octave/files/patch-build-aux_find-defun-files.sh
index e687ad32acf8..d0b23b1b35be 100644
--- a/math/octave/files/patch-build-aux_find-defun-files.sh
+++ b/math/octave/files/patch-build-aux_find-defun-files.sh
@@ -1,6 +1,6 @@
---- build-aux/find-defun-files.sh.orig	2018-04-30 17:03:56 UTC
+--- build-aux/find-defun-files.sh.orig	2020-11-26 18:20:44 UTC
 +++ build-aux/find-defun-files.sh
-@@ -20,7 +20,7 @@
+@@ -27,7 +27,7 @@
  
  set -e
  
diff --git a/math/octave/files/patch-build-aux_find-files-with-tests.sh b/math/octave/files/patch-build-aux_find-files-with-tests.sh
index 8c1eec5da578..8acb71cb655e 100644
--- a/math/octave/files/patch-build-aux_find-files-with-tests.sh
+++ b/math/octave/files/patch-build-aux_find-files-with-tests.sh
@@ -1,6 +1,6 @@
---- build-aux/find-files-with-tests.sh.orig	2018-04-30 17:03:56 UTC
+--- build-aux/find-files-with-tests.sh.orig	2020-11-26 18:20:44 UTC
 +++ build-aux/find-files-with-tests.sh
-@@ -21,7 +21,7 @@
+@@ -28,7 +28,7 @@
  set -e
  
  GREP=${GREP:-grep}
diff --git a/math/octave/files/patch-build-aux_mk-octave-config-h.sh b/math/octave/files/patch-build-aux_mk-octave-config-h.sh
index 979402da1a59..2f679a1e06b7 100644
--- a/math/octave/files/patch-build-aux_mk-octave-config-h.sh
+++ b/math/octave/files/patch-build-aux_mk-octave-config-h.sh
@@ -1,6 +1,6 @@
---- build-aux/mk-octave-config-h.sh.orig	2018-04-30 17:03:56 UTC
+--- build-aux/mk-octave-config-h.sh.orig	2020-11-26 18:20:44 UTC
 +++ build-aux/mk-octave-config-h.sh
-@@ -22,7 +22,7 @@
+@@ -29,7 +29,7 @@
  # autoconf-generated config.h file.  See the notes at the top of the
  # generated octave-config.h file for more details.
  
diff --git a/math/octave/files/patch-configure b/math/octave/files/patch-configure
index b595f2e1dc5f..c5a23986e06d 100644
--- a/math/octave/files/patch-configure
+++ b/math/octave/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2019-03-10 01:37:34 UTC
+--- configure.orig	2020-11-26 18:20:44 UTC
 +++ configure
-@@ -78809,6 +78809,13 @@ $as_echo_n "checking for include file <jni.h>... " >&6
+@@ -83764,6 +83764,13 @@ $as_echo_n "checking for include file <jni.h>... " >&6
          JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/darwin"
        fi
      ;;
diff --git a/math/octave/files/patch-libgnu-math.in.h b/math/octave/files/patch-libgnu_math.in.h
index 0dc2058589ae..077b7d108046 100644
--- a/math/octave/files/patch-libgnu-math.in.h
+++ b/math/octave/files/patch-libgnu_math.in.h
@@ -1,4 +1,4 @@
---- libgnu/math.in.h.orig	2018-04-30 17:03:56 UTC
+--- libgnu/math.in.h.orig	2020-11-26 18:20:44 UTC
 +++ libgnu/math.in.h
 @@ -15,7 +15,7 @@
     You should have received a copy of the GNU General Public License
diff --git a/math/octave/files/patch-libinterp_corefcn_sysdep.cc b/math/octave/files/patch-libinterp_corefcn_sysdep.cc
index c3ebaa947972..2dd96ec87294 100644
--- a/math/octave/files/patch-libinterp_corefcn_sysdep.cc
+++ b/math/octave/files/patch-libinterp_corefcn_sysdep.cc
@@ -1,6 +1,6 @@
---- libinterp/corefcn/sysdep.cc.orig	2019-02-23 17:33:37 UTC
+--- libinterp/corefcn/sysdep.cc.orig	2020-11-26 18:20:44 UTC
 +++ libinterp/corefcn/sysdep.cc
-@@ -58,6 +58,10 @@ along with Octave; see the file COPYING.  If not, see
+@@ -61,6 +61,10 @@
  #  include <omp.h>
  #endif
  
@@ -11,21 +11,3 @@
  #include "cmd-edit.h"
  #include "file-ops.h"
  #include "lo-mappers.h"
-@@ -92,6 +96,7 @@ along with Octave; see the file COPYING.  If not, see
- static void
- BSD_init (void)
- {
-+#if (defined (__FreeBSD__) && !defined(__arm__))
- #  if defined (HAVE_FLOATINGPOINT_H)
-   // Disable trapping on common exceptions.
- #    if ! defined (FP_X_DNML)
-@@ -99,6 +104,9 @@ BSD_init (void)
- #    endif
-   fpsetmask (~(FP_X_OFL|FP_X_INV|FP_X_DZ|FP_X_DNML|FP_X_UFL|FP_X_IMP));
- #  endif
-+#else // FreeBSD && arm
-+  fedisableexcept(FE_ALL_EXCEPT);
-+#endif // FreeBSD && arm
- }
- #endif
-