summaryrefslogtreecommitdiff
path: root/math/octave/files
diff options
context:
space:
mode:
Diffstat (limited to 'math/octave/files')
-rw-r--r--math/octave/files/patch-build-aux_find-defun-files.sh11
-rw-r--r--math/octave/files/patch-build-aux_find-files-with-tests.sh11
-rw-r--r--math/octave/files/patch-build-aux_mk-builtins.sh11
-rw-r--r--math/octave/files/patch-build-aux_mk-octave-config-h.sh11
-rw-r--r--math/octave/files/patch-configure334
-rw-r--r--math/octave/files/patch-gsed88
-rw-r--r--math/octave/files/patch-libgnu-math.in.h6
-rw-r--r--math/octave/files/patch-libinterp_mk-pkg-add11
-rw-r--r--math/octave/files/patch-libinterp_mkops11
-rw-r--r--math/octave/files/patch-liboctave-numeric-eigs-base.cc11
-rw-r--r--math/octave/files/patch-liboctave_system_file-stat.cc11
-rw-r--r--math/octave/files/patch-scripts_mk-pkg-add11
-rw-r--r--math/octave/files/patch-scripts_pkg_private_configure__make.m (renamed from math/octave/files/patch-scripts+pkg+private+configure__make.m)6
13 files changed, 423 insertions, 110 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
new file mode 100644
index 000000000000..215f42db564b
--- /dev/null
+++ b/math/octave/files/patch-build-aux_find-defun-files.sh
@@ -0,0 +1,11 @@
+--- build-aux/find-defun-files.sh.orig 2017-02-22 17:15:26 UTC
++++ build-aux/find-defun-files.sh
+@@ -2,7 +2,7 @@
+
+ set -e
+
+-SED=${SED:-sed}
++SED=gsed
+ EGREP=${EGREP:-egrep}
+
+ # Some stupid egreps don't like empty elements in alternation patterns,
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
new file mode 100644
index 000000000000..fa5305c90b13
--- /dev/null
+++ b/math/octave/files/patch-build-aux_find-files-with-tests.sh
@@ -0,0 +1,11 @@
+--- build-aux/find-files-with-tests.sh.orig 2017-02-22 18:01:55 UTC
++++ build-aux/find-files-with-tests.sh
+@@ -21,7 +21,7 @@
+ set -e
+
+ GREP=${GREP:-grep}
+-SED=${SED:-sed}
++SED=gsed
+
+ srcdir="$1"
+ if [ "$1" ]; then
diff --git a/math/octave/files/patch-build-aux_mk-builtins.sh b/math/octave/files/patch-build-aux_mk-builtins.sh
new file mode 100644
index 000000000000..2ae147889b47
--- /dev/null
+++ b/math/octave/files/patch-build-aux_mk-builtins.sh
@@ -0,0 +1,11 @@
+--- build-aux/mk-builtins.sh.orig 2017-02-22 18:01:55 UTC
++++ build-aux/mk-builtins.sh
+@@ -20,7 +20,7 @@
+
+ set -e
+
+-SED=${SED:-sed}
++SED=gsed
+
+ defun_dld_are_built_in=false
+ make_header=false
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
new file mode 100644
index 000000000000..c2213d9d6090
--- /dev/null
+++ b/math/octave/files/patch-build-aux_mk-octave-config-h.sh
@@ -0,0 +1,11 @@
+--- build-aux/mk-octave-config-h.sh.orig 2017-02-22 18:01:55 UTC
++++ build-aux/mk-octave-config-h.sh
+@@ -22,7 +22,7 @@
+ # autoconf-generated config.h file. See the notes at the top of the
+ # generated octave-config.h file for more details.
+
+-SED=${SED:-sed}
++SED=gsed
+
+ if [ $# -ne 1 ]; then
+ echo "usage: mk-octave-config-h.sh CONFIG-FILE" 1>&2
diff --git a/math/octave/files/patch-configure b/math/octave/files/patch-configure
index 933bf2e05c39..d230604579da 100644
--- a/math/octave/files/patch-configure
+++ b/math/octave/files/patch-configure
@@ -1,16 +1,340 @@
---- configure.orig 2014-01-21 15:52:33.000000000 -0700
-+++ configure 2014-01-21 15:54:59.000000000 -0700
-@@ -68380,6 +68380,13 @@
+--- configure.orig 2017-02-22 18:18:36 UTC
++++ configure
+@@ -17857,7 +17857,7 @@ $as_echo_n "checking whether the $compil
+ hardcode_minus_L=no
+ hardcode_shlibpath_var=unsupported
+ inherit_rpath=no
+- link_all_deplibs=unknown
++ link_all_deplibs=no
+ module_cmds=
+ module_expsym_cmds=
+ old_archive_from_new_cmds=
+@@ -18159,7 +18159,7 @@ _LT_EOF
+ wlarc=
+ else
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ fi
+ ;;
+
+@@ -18178,7 +18178,7 @@ _LT_EOF
+ _LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ else
+ ld_shlibs=no
+ fi
+@@ -18207,7 +18207,7 @@ _LT_EOF
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ else
+ ld_shlibs=no
+ fi
+@@ -18225,7 +18225,7 @@ _LT_EOF
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ else
+ ld_shlibs=no
+ fi
+@@ -18874,7 +18874,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+ hardcode_direct_absolute=yes
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
+ else
+@@ -19723,7 +19723,7 @@ freebsd* | dragonfly*)
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major'
+ soname_spec='$libname$release$shared_ext$major'
+ need_version=no
+ need_lib_prefix=no
+@@ -20867,7 +20867,7 @@ striplib=
+ old_striplib=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+ $as_echo_n "checking whether stripping libraries is possible... " >&6; }
+-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -21119,7 +21119,7 @@ hardcode_automatic_CXX=no
+ inherit_rpath_CXX=no
+ module_cmds_CXX=
+ module_expsym_cmds_CXX=
+-link_all_deplibs_CXX=unknown
++link_all_deplibs_CXX=no
+ old_archive_cmds_CXX=$old_archive_cmds
+ reload_flag_CXX=$reload_flag
+ reload_cmds_CXX=$reload_cmds
+@@ -21330,7 +21330,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+ # archiving commands below assume that GNU ld is being used.
+ if test yes = "$with_gnu_ld"; then
+ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+@@ -22022,7 +22022,7 @@ fi
+ case `$CC -V 2>&1` in
+ *"Version 7."*)
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ ;;
+ *) # Version 8.0 or newer
+ tmp_idyn=
+@@ -22030,7 +22030,7 @@ fi
+ ia64*) tmp_idyn=' -i_dynamic';;
+ esac
+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ ;;
+ esac
+ archive_cmds_need_lc_CXX=no
+@@ -22062,7 +22062,7 @@ fi
+ ;;
+ *) # Version 6 and above use weak symbols
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ ;;
+ esac
+
+@@ -22073,7 +22073,7 @@ fi
+ cxx*)
+ # Compaq C++
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-version-script $wl$lib-ver'
+
+ runpath_var=LD_RUN_PATH
+ hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+@@ -22107,7 +22107,7 @@ fi
+ # Sun C++ 5.9
+ no_undefined_flag_CXX=' -zdefs'
+ archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+- archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script $wl$lib-ver'
+ hardcode_libdir_flag_spec_CXX='-R$libdir'
+ whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+ compiler_needs_object_CXX=yes
+@@ -22175,7 +22175,7 @@ fi
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script,$lib-ver -o $lib'
+ export_dynamic_flag_spec_CXX='$wl-E'
+ whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+ fi
+@@ -23700,7 +23700,7 @@ freebsd* | dragonfly*)
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major'
+ soname_spec='$libname$release$shared_ext$major'
+ need_version=no
+ need_lib_prefix=no
+@@ -24891,7 +24891,7 @@ hardcode_automatic_F77=no
+ inherit_rpath_F77=no
+ module_cmds_F77=
+ module_expsym_cmds_F77=
+-link_all_deplibs_F77=unknown
++link_all_deplibs_F77=no
+ old_archive_cmds_F77=$old_archive_cmds
+ reload_flag_F77=$reload_flag
+ reload_cmds_F77=$reload_cmds
+@@ -25618,7 +25618,7 @@ $as_echo_n "checking whether the $compil
+ hardcode_minus_L_F77=no
+ hardcode_shlibpath_var_F77=unsupported
+ inherit_rpath_F77=no
+- link_all_deplibs_F77=unknown
++ link_all_deplibs_F77=no
+ module_cmds_F77=
+ module_expsym_cmds_F77=
+ old_archive_from_new_cmds_F77=
+@@ -25920,7 +25920,7 @@ _LT_EOF
+ wlarc=
+ else
+ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds_F77='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ fi
+ ;;
+
+@@ -25939,7 +25939,7 @@ _LT_EOF
+ _LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds_F77='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ else
+ ld_shlibs_F77=no
+ fi
+@@ -25968,7 +25968,7 @@ _LT_EOF
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds_F77='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ else
+ ld_shlibs_F77=no
+ fi
+@@ -25986,7 +25986,7 @@ _LT_EOF
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_expsym_cmds_F77='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ else
+ ld_shlibs_F77=no
+ fi
+@@ -26585,7 +26585,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+ hardcode_direct_absolute_F77=yes
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
++ archive_expsym_cmds_F77='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver'
+ hardcode_libdir_flag_spec_F77='$wl-rpath,$libdir'
+ export_dynamic_flag_spec_F77='$wl-E'
+ else
+@@ -27262,7 +27262,7 @@ freebsd* | dragonfly*)
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major'
+ soname_spec='$libname$release$shared_ext$major'
+ need_version=no
+ need_lib_prefix=no
+@@ -35738,7 +35738,7 @@ esac
+ fi
+
+ if test -n "$QTCHOOSER"; then
+- LRELEASEFLAGS="-qt$qt_version"
++ LRELEASEFLAGS=""
+ fi
+ fi
+ fi
+@@ -38632,7 +38632,7 @@ fi
+ fi
+
+ # Generic LAPACK library?
+-for lapack in lapack lapack_rs6k; do
++for lapack in openblasp; do
+ if test $ax_lapack_ok = no; then
+ save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
+ as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_$cheev" | $as_tr_sh`
+@@ -40410,7 +40410,7 @@ fi
+ fi
+
+ # Generic LAPACK library?
+-for lapack in lapack lapack_rs6k; do
++for lapack in openblasp; do
+ if test $ax_lapack_ok = no; then
+ save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
+ as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_$cheev" | $as_tr_sh`
+@@ -42216,7 +42216,7 @@ fi
+ fi
+
+ # Generic LAPACK library?
+-for lapack in lapack lapack_rs6k; do
++for lapack in openblasp; do
+ if test $ax_lapack_ok = no; then
+ save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
+ as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_$cheev" | $as_tr_sh`
+@@ -43161,7 +43161,7 @@ $as_echo "$as_me: WARNING: $warn_ccolamd
+
+ ### Check for CHOLMOD library.
+ ### If your cholmod library requires cblas, then you will need to
+-### configure with --with-cholmod="-lcholmod -lcblas".
++### configure with --with-cholmod="-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd -lopenblasp -lcblas".
+
+ save_LIBS="$LIBS"
+ LIBS="$COLAMD_LDFLAGS $COLAMD_LIBS $AMD_LDFLAGS $AMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS"
+@@ -43201,7 +43201,7 @@ fi
+ ;;
+ yes | "")
+ ac_octave_cholmod_pkg_check=yes
+- CHOLMOD_LIBS="-lcholmod"
++ CHOLMOD_LIBS="-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd -lopenblasp"
+ ;;
+ -* | */* | *.a | *.so | *.so.* | *.o)
+ CHOLMOD_LIBS="$with_cholmod"
+@@ -43602,7 +43602,7 @@ fi
+ ;;
+ yes | "")
+ ac_octave_umfpack_pkg_check=yes
+- UMFPACK_LIBS="-lumfpack"
++ UMFPACK_LIBS="-lumfpack -lsuitesparseconfig -lamd -lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd -lopenblasp -lcolamd -lopenblasp"
+ ;;
+ -* | */* | *.a | *.so | *.so.* | *.o)
+ UMFPACK_LIBS="$with_umfpack"
+@@ -43767,7 +43767,7 @@ fi
+ ;;
+ yes | "")
+ ac_octave_umfpack_pkg_check=yes
+- UMFPACK_LIBS="-lumfpack"
++ UMFPACK_LIBS="-lumfpack -lsuitesparseconfig -lamd -lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd -lopenblasp -lcolamd -lopenblasp"
+ ;;
+ -* | */* | *.a | *.so | *.so.* | *.o)
+ UMFPACK_LIBS="$with_umfpack"
+@@ -54704,7 +54704,7 @@ else
+ *-gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+ # Guess yes on FreeBSD >= 5.
+ freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";;
+- freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
++dragonfly* | freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+ # Guess yes on Mac OS X >= 10.3.
+ darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";;
+ darwin*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+@@ -59551,7 +59551,7 @@ $as_echo "#define FLEXIBLE_ARRAY_MEMBER
+ aix* | beos* | openbsd* | mirbsd* | irix*)
+ FLOAT_H=float.h
+ ;;
+- freebsd*)
++dragonfly* | freebsd*)
+ case "$host_cpu" in
+ i[34567]86 )
+ FLOAT_H=float.h
+@@ -65648,7 +65648,7 @@ else
+ if test "$cross_compiling" = yes; then :
+
+ case "$host_os" in
+- freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
++dragonfly* | freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
+ gl_cv_func_open_slash="guessing no" ;;
+ *)
+ gl_cv_func_open_slash="guessing yes" ;;
+@@ -74358,6 +74358,13 @@ $as_echo_n "checking for include file <j
fi
JAVA_LIBS="-framework JavaVM"
;;
+ freebsd*)
+ if test -n "$JAVA_CPPFLAGS"; then
-+ JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/freebsd"
++ JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS} -I${JAVA_CPPFLAGS}/freebsd"
+ else
+ JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd"
+ fi
+ ;;
*)
if test -n "$JAVA_CPPFLAGS"; then
- JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/linux"
+ JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS} -I${JAVA_CPPFLAGS}/linux"
diff --git a/math/octave/files/patch-gsed b/math/octave/files/patch-gsed
deleted file mode 100644
index 60baf64ae811..000000000000
--- a/math/octave/files/patch-gsed
+++ /dev/null
@@ -1,88 +0,0 @@
---- build-aux/find-files-with-tests.sh.orig 2014-01-20 20:35:29.000000000 -0700
-+++ build-aux/find-files-with-tests.sh 2014-01-20 20:36:30.000000000 -0700
-@@ -2,7 +2,7 @@
-
- set -e
- GREP=${GREP:-grep}
--SED=${SED:-sed}
-+SED=gsed
-
- srcdir="$1"
- shift
---- libinterp/find-defun-files.sh.orig 2014-01-20 20:08:01.000000000 -0700
-+++ libinterp/find-defun-files.sh 2014-01-20 20:08:20.000000000 -0700
-@@ -1,7 +1,7 @@
- #! /bin/sh
-
- set -e
--SED=${SED:-sed}
-+SED=gsed
- EGREP=${EGREP:-egrep}
-
- # Some stupid egreps don't like empty elements in alternation patterns,
---- libinterp/mk-pkg-add.orig 2014-01-20 20:04:33.000000000 -0700
-+++ libinterp/mk-pkg-add 2014-01-20 20:05:01.000000000 -0700
-@@ -20,7 +20,7 @@
-
- set -e
-
--SED=${SED:-'sed'}
-+SED=gsed
-
- for f in "$@"; do
- if [ -f $f ]; then
---- libinterp/mkbuiltins.orig 2014-01-20 19:17:57.000000000 -0700
-+++ libinterp/mkbuiltins 2014-01-20 19:18:24.000000000 -0700
-@@ -23,7 +23,7 @@
- exit 1
- fi
-
--SED=${SED:-'sed'}
-+SED=gsed
-
- make_header=false
- make_source=false
---- libinterp/mkdefs.orig 2014-01-20 20:17:00.000000000 -0700
-+++ libinterp/mkdefs 2014-01-20 20:17:15.000000000 -0700
-@@ -18,7 +18,7 @@
- # along with Octave; see the file COPYING. If not, see
- # <http://www.gnu.org/licenses/>.
-
--SED=${SED:-'sed'}
-+SED=gsed
-
- if [ $# -ne 2 ]; then
- echo "usage: mkdefs srcdir file < preprocessed-file-contents" 1>&2
---- libinterp/mkops.orig 2014-01-20 20:26:24.000000000 -0700
-+++ libinterp/mkops 2014-01-20 20:26:50.000000000 -0700
-@@ -18,7 +18,7 @@
- # along with Octave; see the file COPYING. If not, see
- # <http://www.gnu.org/licenses/>.
-
--SED=${SED:-'sed'}
-+SED=gsed
-
- cat << \EOF
- // DO NOT EDIT! Generated automatically by mkops.
---- liboctave/cruft/mkf77def.in.orig 2014-01-20 05:27:13.000000000 -0700
-+++ liboctave/cruft/mkf77def.in 2014-01-20 05:27:28.000000000 -0700
-@@ -18,7 +18,7 @@
- # along with Octave; see the file COPYING. If not, see
- # <http://www.gnu.org/licenses/>.
-
--SED=${SED:-'sed'}
-+SED=gsed
- AWK=${AWK:-'awk'}
-
- F77_TOLOWER="@F77_APPEND_UNDERSCORE@"
---- scripts/mk-pkg-add.orig 2014-01-20 20:30:14.000000000 -0700
-+++ scripts/mk-pkg-add 2014-01-20 20:30:36.000000000 -0700
-@@ -24,7 +24,7 @@
-
- set -e
-
--SED=${SED:-'sed'}
-+SED=gsed
-
- prefix="$1/"
- shift
diff --git a/math/octave/files/patch-libgnu-math.in.h b/math/octave/files/patch-libgnu-math.in.h
index e6e185025978..0a1794f1f8ee 100644
--- a/math/octave/files/patch-libgnu-math.in.h
+++ b/math/octave/files/patch-libgnu-math.in.h
@@ -1,6 +1,6 @@
---- libgnu/math.in.h.orig 2013-02-21 21:21:17.000000000 +0100
-+++ libgnu/math.in.h 2013-11-22 12:35:47.000000000 +0100
-@@ -17,7 +17,7 @@
+--- libgnu/math.in.h.orig 2017-02-22 18:17:36 UTC
++++ libgnu/math.in.h
+@@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
diff --git a/math/octave/files/patch-libinterp_mk-pkg-add b/math/octave/files/patch-libinterp_mk-pkg-add
new file mode 100644
index 000000000000..df7bee3ef4ed
--- /dev/null
+++ b/math/octave/files/patch-libinterp_mk-pkg-add
@@ -0,0 +1,11 @@
+--- libinterp/mk-pkg-add.orig 2017-02-22 18:01:55 UTC
++++ libinterp/mk-pkg-add
+@@ -20,7 +20,7 @@
+
+ set -e
+
+-SED=${SED:-sed}
++SED=gsed
+
+ srcdir="$1"
+ shift
diff --git a/math/octave/files/patch-libinterp_mkops b/math/octave/files/patch-libinterp_mkops
new file mode 100644
index 000000000000..fcb52de86241
--- /dev/null
+++ b/math/octave/files/patch-libinterp_mkops
@@ -0,0 +1,11 @@
+--- libinterp/mkops.orig 2017-02-22 18:01:55 UTC
++++ libinterp/mkops
+@@ -18,7 +18,7 @@
+ # along with Octave; see the file COPYING. If not, see
+ # <http://www.gnu.org/licenses/>.
+
+-SED=${SED:-sed}
++SED=gsed
+
+ cat << \EOF
+ // DO NOT EDIT! Generated automatically by mkops.
diff --git a/math/octave/files/patch-liboctave-numeric-eigs-base.cc b/math/octave/files/patch-liboctave-numeric-eigs-base.cc
deleted file mode 100644
index 216faa85df43..000000000000
--- a/math/octave/files/patch-liboctave-numeric-eigs-base.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- liboctave/numeric/eigs-base.cc.orig 2014-01-20 05:36:55.000000000 -0700
-+++ liboctave/numeric/eigs-base.cc 2014-01-20 05:37:23.000000000 -0700
-@@ -3849,7 +3849,7 @@
- int disp = 0, int maxit = 300);
- #endif
-
--#ifndef _MSC_VER
-+#if !defined(_MSC_VER) && !defined(__clang__)
- template octave_idx_type
- lusolve (const SparseMatrix&, const SparseMatrix&, Matrix&);
-
diff --git a/math/octave/files/patch-liboctave_system_file-stat.cc b/math/octave/files/patch-liboctave_system_file-stat.cc
new file mode 100644
index 000000000000..05d15738d832
--- /dev/null
+++ b/math/octave/files/patch-liboctave_system_file-stat.cc
@@ -0,0 +1,11 @@
+--- liboctave/system/file-stat.cc.orig 2017-02-22 18:01:55 UTC
++++ liboctave/system/file-stat.cc
+@@ -174,7 +174,7 @@ namespace octave
+ update_internal ();
+ }
+
+- inline file_stat::~file_stat () { }
++ file_stat::~file_stat () { }
+
+ void
+ file_stat::update_internal (bool force)
diff --git a/math/octave/files/patch-scripts_mk-pkg-add b/math/octave/files/patch-scripts_mk-pkg-add
new file mode 100644
index 000000000000..56b78e04f53a
--- /dev/null
+++ b/math/octave/files/patch-scripts_mk-pkg-add
@@ -0,0 +1,11 @@
+--- scripts/mk-pkg-add.orig 2017-02-22 18:01:55 UTC
++++ scripts/mk-pkg-add
+@@ -24,7 +24,7 @@
+
+ set -e
+
+-SED=${SED:-sed}
++SED=gsed
+
+ prefix="$1/"
+ if [ "$1" ]; then
diff --git a/math/octave/files/patch-scripts+pkg+private+configure__make.m b/math/octave/files/patch-scripts_pkg_private_configure__make.m
index 5719849538a9..1e6b0b6bce61 100644
--- a/math/octave/files/patch-scripts+pkg+private+configure__make.m
+++ b/math/octave/files/patch-scripts_pkg_private_configure__make.m
@@ -1,6 +1,6 @@
---- scripts/pkg/private/configure_make.m~ 2016-01-08 13:18:07.395384102 +0900
-+++ scripts/pkg/private/configure_make.m 2016-01-08 13:18:53.562389185 +0900
-@@ -88,7 +88,7 @@
+--- scripts/pkg/private/configure_make.m.orig 2017-02-22 18:01:55 UTC
++++ scripts/pkg/private/configure_make.m
+@@ -87,7 +87,7 @@ function configure_make (desc, packdir,
endif
if (exist (fullfile (src, "Makefile"), "file"))