Octave: update to 4.2.0

pkgsrc changes: removed all patches to do with qt5 support, upstream
code does it now. blindly moved some patches that were replacing
INSTALL_PROGRAM to INSTALL_LIB as the build changed. added patch
replacing struct tm_zone with timezone_t to accommodate for missing
type in NetBSD - same as libgnu does.

ok adam

Summary of important user-visible changes for version 4.2:
---------------------------------------------------------

 ** The parser has been extended to accept, but ignore, underscore
    characters in numbers.  This facilitates writing more legible code
    by using '_' as a thousands separator or to group nibbles into bytes
    in hex constants.

    Examples: 1_000_000 == 1e6  or  0xDE_AD_BE_EF

 ** The parser has been extended to understand binary numbers which
    begin with the prefix '0b' or '0B'.  The value returned is Octave's
    default numeric class of double, not at unsigned integer class.
    Therefore numbers greater than flintmax, i.e., 2^53, will lose some
    precision.

    Examples: 0b101 == 5  or  0B1100_0001 == 0xC1

 ** gnuplot 4.4 is now the minimum version supported by Octave.

 ** The default set of colors used to plot lines has been updated to be
    compatible with Matlab's new default color scheme.  The line plot
    color scheme can be set with the axes property "ColorOrder".

 ** The default colormap is now set to "viridis" which is also the
    default colormap in matplotlib.  This new colormap fixes some of the
    main issues with the old default colormap "jet" such as its bad
    "luminance profile" and is also more similar to Matlab's new default
    colormap "parula".

 ** The colormap function no longer supports the input argument "list"
    to show built-in colormaps.  Use "help colormap" to find the
    built-in colormaps.

 ** The graphics command "hold on" now ensures that each new plot added
    to an existing plot has a different color or linestyle according to
    the "ColorOrder" and/or "LineStyleOrder" properties.  This is
    equivalent to the old command "hold all" and was made for Matlab
    compatibility.  Existing code *may* produce differently colored
    plots if it did not specify the color for a plot and relied on each
    new plot having the default first color in the "ColorOrder"
    property.

 ** When starting, Octave now looks in the function path for a file
    startup.m and executes any commands found there.  This change was
    made to accommodate Matlab users.  Octave has it's own configuration
    system based on the file .octaverc which is preferred.

 ** Octal ('\NNN') and hex ('\xNN') escape sequences in single quoted
    strings are now interpreted by the function do_string_escapes().
    The *printf family of functions now supports octal and hex escape
    sequences in single-quoted strings for Matlab compatibility.

 ** Special octal and hex escape sequences for the pattern and
    replacement strings in regular expressions are now interpreted for
    Matlab compatibility.

    octal: '\oNNN' or '\o{NNN}'
    hex  : '\xNN'  or '\x{NN}'

 ** Unknown escape sequences in the replacement string for regexprep are
    now substituted with their unescaped version and no warning is
    emitted.  This change was made for Matlab compatibility.

    Example: regexprep ('a', 'a', 'x\yz')
             => 'xyz'

 ** mkfifo now interprets the MODE argument as an octal, not decimal,
    integer.  This is consistent with the equivalent shell command.

 ** linspace now returns an empty matrix if the number of requested
    points is 0 or a negative number.  This change was made to be
    compatible with Matlab releases newer than 2011.  In addition,
    Octave no longer supports matrix inputs for A or B.

 ** The cov function now returns the complex conjugate of the result
    from previous versions of Octave.  This change was made for
    compatibility with Matlab.

 ** condest now works with a normest1 compatible syntax.

 ** The griddata function no longer plots the interpolated mesh if no
    output argument is requested, instead the vector or array of
    interpolated values is always returned for Matlab compatibility.

 ** The new function "light" and the corresponding graphics object
    provide light and shadow effects for patch and surface objects.

 ** The surfnorm function now returns unnormalized (magnitude != 1)
    normal vectors for compatibility with Matlab.

 ** The normal vectors returned from isonormals have been reversed to
    point towards smaller values for compatibility with Matlab.

 ** The quadl function now uses an absolute, rather than relative,
    tolerance for Matlab compatibility.  The default tolerance is 1e-6
    which may result in lower precision results than previous versions
    of Octave which used eps as the relative tolerance.  The quadl
    function has also been extended to return a second output with the
    total number of function evaluations.

 ** The textscan function is now built-in and is much faster and much
    more Matlab-compatible than the previous m-file version.

 ** Dialog boxes--errordlg, helpdlg, inputdlg, listdlg, msgbox,
    questdlg, and warndlg--now exclusively use Qt for rendering.
    Java based versions have been removed.

 ** The axes properties "TitleFontSizeMultiplier" and "TitleFontWeight"
    are now implemented which control the default appearance of text
    created with title().
    The axes property "LabelFontSizeMultiplier" is now implemented
    which controls the default appearance of text created with
    xlabel(), ylabel(), or zlabel().

 ** The graphics property "box" for axes now defaults to "off".
    To obtain equivalent plots to previous versions of Octave use
      set (0, "DefaultAxesBox", "on");
    in your .octaverc file.

 ** The graphics property "boxstyle" has been implemented.  The default
    is "back" which draws only the back planes in a 3-D view.  If the
    option is "full" then all planes are drawn.

 ** The graphics property "erasemode" has been hidden, and will
    eventually be removed.  This property has also been removed
    from Matlab, and was never implemented in Octave.

 ** The graphics property "graphicssmoothing" for figures now controls
    whether anti-aliasing will be used for lines.  The default is "on".

 ** The value "zero" for the axes properties "xaxislocation" and
    "yaxislocation" has been deprecated and will be removed from
    Octave 4.6.  Use "origin" instead.

 ** The publish function allows easy publication of Octave script files
    in HTML or other formats, including figures and output created by
    this script.  It comes with its counterpart grabcode, which lets one
    literally grab the HTML published code from a remote website, for
    example.

 ** The value of the MEX variable TrapFlag now defaults to 0, which will
    cause Octave to abort execution of a MEX file and return to the
    prompt if an error is encountered in mexCallMATLAB.

 ** The MEX API now includes the function mexCallMATLABWithTrap.  This
    function will not abort if an error occurs during mexCallMATLAB, but
    instead will return execution to the MEX function for error
    handling.

 ** The MEX API functions for input validation that begin with "mxIs"
    (e.g., mxIsDouble, mxIsEmpty, etc.) now return type bool rather than
    type int.

 ** The functions mxAssert and mxAssertS for checking assertions have
    been added.  In order to avoid a performance penalty they are only
    compiled in to debug versions of a MEX file, i.e., that are produced
    when the '-g' option is given to mex or mkoctfile.

 ** Other new MEX API functions include mexEvalStringWithTrap,
    mxIsScalar, mxCreateUninitNumericArray, mxCreateUninitNumericMatrix.

 ** Other new functions added in 4.2:

      audioformats
      camlight
      condeig
      deg2rad
      dialog
      evalc
      hash
      im2double
      isocaps
      lighting
      localfunctions
      material
      normest1
      ode23
      ode45
      odeget
      odeplot
      odeset
      padecoef
      profexport
      psi
      rad2deg
      reducepatch
      reducevolume
      smooth3
      uibuttongroup

 ** Deprecated functions.

    The following functions have been deprecated in Octave 4.2 and will
    be removed from Octave 4.6 (or whatever version is the second major
    release after 4.2):

      Function             | Replacement
      ---------------------|------------------
      bitmax               | flintmax
      mahalanobis          | mahal in Octave-Forge statistics pkg
      md5sum               | hash
      octve_config_info    | __octave_config_info__
      onenormest           | normest1
      sleep                | pause
      usleep               | pause
      wavread              | audioread
      wavwrite             | audiowrite

 ** The following functions were deprecated in Octave 3.8 and have been
    removed from Octave 4.2.

      default_save_options    java_new
      gen_doc_cache           java_unsigned_conversion
      interp1q                javafields
      isequalwithequalnans    javamethods
      java_convert_matrix     re_read_readline_init_file
      java_debug              read_readline_init_file
      java_invoke             saving_history

 ** The global error_state variable in Octave's C++ API has been
    deprecated and will be removed in a future version.  Now the error
    and print_usage functions throw an exception
    (octave::execution_exception) after displaying the error message.
    This makes the error and print_usage functions in C++ work more like
    the corresponding functions in the scripting language.

 ** The default error handlers in liboctave have been updated to use
    exceptions.  After displaying an error message they no longer return
    control to the calling program.  The error handler function can be
    customized through the global variables
    "current_liboctave_error_handler" and
    "current_liboctave_error_with_id_handler".  If a programmer has
    installed their own custom error handling routines when directly
    linking with liboctave then these must be updated to throw an
    exception and not return to the calling program.

 ** The system for common errors and warnings has been renamed from
    gripe_XXX to either err_XXX if error is called or warn_XXX if
    warning is called.  The gripe_XXX functions are deprecated and will
    be removed in version 4.6.

 ** New configure option, --enable-address-sanitizer-flags, to build
    Octave with memory allocator checks (similar to those in valgrind)
    built in.

27 files changed, 72 insertions, 656 deletions

diff --git a/math/octave/patches/patch-configure b/math/octave/patches/patch-configure
index f5e41b6b463..10e55e831c8 100644
--- a/math/octave/patches/patch-configure
+++ b/math/octave/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.4 2016/09/28 02:54:15 maya Exp $
+$NetBSD: patch-configure,v 1.5 2016/11/19 21:53:12 maya Exp $
 
 install .oct loadable modules with INSTALL_LIB to avoid stripping them
 
@@ -8,9 +8,9 @@ the guess it had for linux (x86_64-unknown-linux-gnu), seems to trample
 over our own tools:
 https://mail-index.netbsd.org/pkgsrc-users/2014/03/26/msg019464.html
 
---- configure.orig	2015-05-26 16:21:37.000000000 +0000
+--- configure.orig	2016-11-13 15:22:50.000000000 +0000
 +++ configure
-@@ -1952,6 +1952,7 @@ DEFAULT_PAGER
+@@ -1971,6 +1971,7 @@ DEFAULT_PAGER
  GNUPLOT
  GHOSTSCRIPT
  DESKTOP_FILE_INSTALL
@@ -18,7 +18,7 @@ https://mail-index.netbsd.org/pkgsrc-users/2014/03/26/msg019464.html
  LN_S
  TEXI2PDF
  TEXI2DVI
-@@ -5870,7 +5871,7 @@ case $host_os in *\ *) host_os=`echo "$h
+@@ -5938,7 +5939,7 @@ case $host_os in *\ *) host_os=`echo "$h
      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: configuring Octave for unknown system type" >&5
  $as_echo "$as_me: WARNING: configuring Octave for unknown system type" >&2;}
    fi
@@ -27,18 +27,18 @@ https://mail-index.netbsd.org/pkgsrc-users/2014/03/26/msg019464.html
  
    if test -z "$host_cpu"; then
      host_cpu=unknown
-@@ -8620,7 +8621,9 @@ fi
+@@ -9211,8 +9212,9 @@ fi
  
  
  
--INSTALL_SCRIPT='${INSTALL}'
 +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+
+ 
+-INSTALL_SCRIPT="${INSTALL}"
 +test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL_SCRIPT}'
  
  
  
-@@ -14005,7 +14008,12 @@ else
+@@ -28323,7 +28325,12 @@ else
  fi
  	  done
  	  ;;
diff --git a/math/octave/patches/patch-configure.ac b/math/octave/patches/patch-configure.ac
index bcd2f701d86..43dc9a8345e 100644
--- a/math/octave/patches/patch-configure.ac
+++ b/math/octave/patches/patch-configure.ac
@@ -1,18 +1,19 @@
-$NetBSD: patch-configure.ac,v 1.2 2016/02/16 04:21:40 dbj Exp $
+$NetBSD: patch-configure.ac,v 1.3 2016/11/19 21:53:12 maya Exp $
 
 install .oct loadable modules with INSTALL_LIB to avoid stripping them
 
---- configure.ac.orig	2015-05-26 16:16:39.000000000 +0000
+--- configure.ac.orig	2016-11-13 15:19:37.000000000 +0000
 +++ configure.ac
-@@ -149,8 +149,10 @@ AC_PROG_LN_S
+@@ -208,8 +208,11 @@ AC_PROG_LN_S
  AC_PROG_MKDIR_P
  
  AC_PROG_INSTALL
--INSTALL_SCRIPT='${INSTALL}'
+-INSTALL_SCRIPT="${INSTALL}"
 +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
  AC_SUBST(INSTALL_SCRIPT)
 +test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL_SCRIPT}'
 +AC_SUBST(INSTALL_LIB)
++
  
  OCTAVE_PROG_DESKTOP_FILE_INSTALL
  
diff --git a/math/octave/patches/patch-fflush-fpos_t.c b/math/octave/patches/patch-fflush-fpos_t.c
deleted file mode 100644
index 041fefe8210..00000000000
--- a/math/octave/patches/patch-fflush-fpos_t.c
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-fflush-fpos_t.c,v 1.2 2016/02/16 04:21:40 dbj Exp $
-
---- libgnu/fflush.c.orig	2015-05-23 14:36:16.000000000 +0000
-+++ libgnu/fflush.c
-@@ -22,6 +22,7 @@
- #include <stdio.h>
- 
- #include <errno.h>
-+#include <string.h>
- #include <unistd.h>
- 
- #include "freading.h"
-@@ -103,17 +104,12 @@ update_fpos_cache (FILE *fp _GL_UNUSED_P
-   /* fp_->_offset is typed as an integer.  */
-   fp_->_offset = pos;
- #   else
--  /* fp_->_offset is an fpos_t.  */
--  /* Use a union, since on NetBSD, the compilation flags determine
--     whether fpos_t is typedef'd to off_t or a struct containing a
--     single off_t member.  */
--  union
--    {
--      fpos_t f;
--      off_t o;
--    } u;
--  u.o = pos;
--  fp_->_offset = u.f;
-+  /*
-+   * fp_->_offset is an fpos_t or off_t
-+   * in either case the off_t part is the first member of it.
-+   */
-+  memset(&fp_->_offset, 0, sizeof(fp_->_offset));
-+  memcpy(&fp_->_offset, &pos, sizeof(pos));
- #   endif
-   fp_->_flags |= __SOFF;
- #  endif
diff --git a/math/octave/patches/patch-libgui_graphics_Canvas.cc b/math/octave/patches/patch-libgui_graphics_Canvas.cc
deleted file mode 100644
index fb7842362f1..00000000000
--- a/math/octave/patches/patch-libgui_graphics_Canvas.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-libgui_graphics_Canvas.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
-
-Changes for compiling with Qt5 instead of Qt4
-
---- libgui/graphics/Canvas.cc.orig	2015-05-23 14:21:53.000000000 +0000
-+++ libgui/graphics/Canvas.cc
-@@ -527,7 +527,7 @@ Canvas::canvasMousePressEvent (QMouseEve
-               QRectF r (bb(0), bb(1), bb(2), bb(3));
- 
-               r.adjust (-5, -5, 5, 5);
--              if (r.contains (event->posF ()))
-+              if (r.contains (event->localPos ()))
-                 {
-                   currentObj = childObj;
-                   break;
-@@ -554,7 +554,7 @@ Canvas::canvasMousePressEvent (QMouseEve
-                   Matrix bb = it->get_properties ().get_boundingbox (true);
-                   QRectF r (bb(0), bb(1), bb(2), bb(3));
- 
--                  if (r.contains (event->posF ()))
-+                  if (r.contains (event->localPos ()))
-                     axesObj = *it;
-                 }
- 
diff --git a/math/octave/patches/patch-libgui_graphics_Object.cc b/math/octave/patches/patch-libgui_graphics_Object.cc
deleted file mode 100644
index 9d92abda07b..00000000000
--- a/math/octave/patches/patch-libgui_graphics_Object.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libgui_graphics_Object.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
-
-Changes for compiling with Qt5 instead of Qt4
-
---- libgui/graphics/Object.cc.orig	2015-05-23 14:21:53.000000000 +0000
-+++ libgui/graphics/Object.cc
-@@ -183,7 +183,7 @@ Object::fromQObject (QObject* obj)
-   QVariant v = obj->property ("QtHandles::Object");
- 
-   if (v.isValid ())
--    return reinterpret_cast<Object*> (qVariantValue<void*> (v));
-+    return reinterpret_cast<Object*> (qvariant_cast<void*> (v));
- 
-   return 0;
- }
diff --git a/math/octave/patches/patch-libgui_qterminal_libqterminal_QTerminal.cc b/math/octave/patches/patch-libgui_qterminal_libqterminal_QTerminal.cc
deleted file mode 100644
index 58d5c6bf871..00000000000
--- a/math/octave/patches/patch-libgui_qterminal_libqterminal_QTerminal.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-libgui_qterminal_libqterminal_QTerminal.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
-
-Changes for compiling with Qt5 instead of Qt4
-
---- libgui/qterminal/libqterminal/QTerminal.cc.orig	2015-05-23 14:21:53.000000000 +0000
-+++ libgui/qterminal/libqterminal/QTerminal.cc
-@@ -144,10 +144,10 @@ QTerminal::notice_settings (const QSetti
-     copy = QKeySequence::Copy; // settings->value () does not work!
- 
-   //  dis- or enable extra interrupt action
--  QKeySequence ctrl;
-+  Qt::KeyboardModifiers ctrl;
-   ctrl = Qt::ControlModifier;
- 
--  bool extra_ir_action = (copy != QKeySequence (ctrl + Qt::Key_C));
-+  bool extra_ir_action = (copy != QKeySequence (ctrl | Qt::Key_C));
- 
-   _interrupt_action->setEnabled (extra_ir_action);
-   has_extra_interrupt (extra_ir_action);
diff --git a/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_TerminalView.cpp b/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_TerminalView.cpp
deleted file mode 100644
index 4680a845b3a..00000000000
--- a/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_TerminalView.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-libgui_qterminal_libqterminal_unix_TerminalView.cpp,v 1.1 2016/02/16 04:21:40 dbj Exp $
-
-Changes for compiling with Qt5 instead of Qt4
-
---- libgui/qterminal/libqterminal/unix/TerminalView.cpp.orig	2015-05-23 14:21:53.000000000 +0000
-+++ libgui/qterminal/libqterminal/unix/TerminalView.cpp
-@@ -41,6 +41,7 @@
- #include <QPixmap>
- #include <QScrollBar>
- #include <QStyle>
-+#include <QToolTip>
- #include <QtCore>
- #include <QtGui>
- 
diff --git a/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_Vt102Emulation.cpp b/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_Vt102Emulation.cpp
deleted file mode 100644
index 4177d6cdc68..00000000000
--- a/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_Vt102Emulation.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libgui_qterminal_libqterminal_unix_Vt102Emulation.cpp,v 1.1 2016/02/16 04:21:40 dbj Exp $
-
-Changes for compiling with Qt5 instead of Qt4
-
---- libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp.orig	2015-05-23 14:21:53.000000000 +0000
-+++ libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp
-@@ -994,7 +994,7 @@ void Vt102Emulation::sendKeyEvent( QKeyE
-                                          "is missing.");
- 
-         reset();
--        receiveData( translatorError.toAscii().constData() , translatorError.count() );
-+        receiveData( translatorError.toLatin1().constData() , translatorError.count() );
-     }
- }
- 
diff --git a/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_konsole__wcwidth.h b/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_konsole__wcwidth.h
deleted file mode 100644
index 99f2179a06c..00000000000
--- a/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_konsole__wcwidth.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-libgui_qterminal_libqterminal_unix_konsole__wcwidth.h,v 1.1 2016/02/16 04:21:40 dbj Exp $
-
-Changes for compiling with Qt5 instead of Qt4
-
---- libgui/qterminal/libqterminal/unix/konsole_wcwidth.h.orig	2015-05-23 14:21:53.000000000 +0000
-+++ libgui/qterminal/libqterminal/unix/konsole_wcwidth.h
-@@ -11,7 +11,6 @@
- #define	_KONSOLE_WCWIDTH_H_
- 
- // Qt
--#include <QtCore/QBool>
- #include <QtCore/QString>
- 
- int konsole_wcwidth(quint16 ucs);
diff --git a/math/octave/patches/patch-libgui_src_find-files-dialog.cc b/math/octave/patches/patch-libgui_src_find-files-dialog.cc
deleted file mode 100644
index b190bffc23f..00000000000
--- a/math/octave/patches/patch-libgui_src_find-files-dialog.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libgui_src_find-files-dialog.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
-
---- libgui/src/find-files-dialog.cc.orig	2015-05-23 14:21:53.000000000 +0000
-+++ libgui/src/find-files-dialog.cc
-@@ -125,7 +125,7 @@ find_files_dialog::find_files_dialog (QW
-   _file_list->horizontalHeader ()->restoreState (
-     settings->value ("findfiles/column_state").toByteArray ());
-   _file_list->horizontalHeader ()->setSortIndicatorShown (true);
--  _file_list->horizontalHeader ()->setClickable (true);
-+  _file_list->horizontalHeader ()->setSectionsClickable (true);
-   _file_list->horizontalHeader ()->setStretchLastSection (true);
-   _file_list->sortByColumn (
-                 settings->value ("findfiles/sort_files_by_column",0).toInt (),
diff --git a/math/octave/patches/patch-libgui_src_octave-gui.cc b/math/octave/patches/patch-libgui_src_octave-gui.cc
deleted file mode 100644
index 64f721cdfa2..00000000000
--- a/math/octave/patches/patch-libgui_src_octave-gui.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-libgui_src_octave-gui.cc,v 1.2 2016/08/06 13:03:35 prlw1 Exp $
-
-Changes for compiling with Qt5 instead of Qt4
-
---- libgui/src/octave-gui.cc.orig	2016-04-20 18:23:57.000000000 +0000
-+++ libgui/src/octave-gui.cc
-@@ -92,7 +92,7 @@ private:
- // Disable all Qt messages by default.
- 
- static void
--message_handler (QtMsgType, const char *)
-+message_handler (QtMsgType, const QMessageLogContext &, const QString &)
- {
- }
- 
-@@ -108,7 +108,7 @@ octave_start_gui (int argc, char *argv[]
- 
-   // Installing our handler suppresses the messages.
-   if (show_gui_msgs.empty ())
--    qInstallMsgHandler (message_handler);
-+    qInstallMessageHandler (message_handler);
- 
-   install___init_qt___functions ();
- 
-@@ -119,7 +119,7 @@ octave_start_gui (int argc, char *argv[]
- 
-   // Set the codec for all strings (before wizard)
- #if ! defined (Q_OS_WIN32)
--  QTextCodec::setCodecForCStrings (QTextCodec::codecForName ("UTF-8"));
-+  QTextCodec::setCodecForLocale (QTextCodec::codecForName ("UTF-8"));
- #endif
- 
-   // show wizard if this is the first run
diff --git a/math/octave/patches/patch-libgui_src_resource-manager.cc b/math/octave/patches/patch-libgui_src_resource-manager.cc
deleted file mode 100644
index bfa5e9cc3fd..00000000000
--- a/math/octave/patches/patch-libgui_src_resource-manager.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-libgui_src_resource-manager.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
-
-Changes for compiling with Qt5 instead of Qt4
-
---- libgui/src/resource-manager.cc.orig	2015-05-23 14:21:54.000000000 +0000
-+++ libgui/src/resource-manager.cc
-@@ -61,10 +61,8 @@ resource_manager::resource_manager (void
-   : settings_directory (), settings_file (), settings (0),
-     default_settings (0)
- {
--  QDesktopServices desktopServices;
--
-   QString home_path
--    = desktopServices.storageLocation (QDesktopServices::HomeLocation);
-+    = QStandardPaths::writableLocation (QStandardPaths::HomeLocation);
- 
-   settings_directory = home_path + "/.config/octave";
- 
diff --git a/math/octave/patches/patch-libgui_src_shortcut-manager.cc b/math/octave/patches/patch-libgui_src_shortcut-manager.cc
deleted file mode 100644
index be5aeee67f3..00000000000
--- a/math/octave/patches/patch-libgui_src_shortcut-manager.cc
+++ /dev/null
@@ -1,297 +0,0 @@
-$NetBSD: patch-libgui_src_shortcut-manager.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
-
-Changes for compiling with Qt5 instead of Qt4
-
---- libgui/src/shortcut-manager.cc.orig	2015-05-23 14:21:53.000000000 +0000
-+++ libgui/src/shortcut-manager.cc
-@@ -86,8 +86,8 @@ shortcut_manager::instance_ok (void)
- void
- shortcut_manager::do_init_data ()
- {
--  QKeySequence ctrl;
--  int prefix;
-+	Qt::KeyboardModifiers ctrl;
-+	Qt::KeyboardModifiers prefix;
- #if defined (Q_OS_MAC)
-   // Use CMD key as an equivalent of Ctrl key on other platforms
-   ctrl =  Qt::MetaModifier;
-@@ -100,15 +100,15 @@ shortcut_manager::do_init_data ()
-   prefix = Qt::NoModifier;
- #endif
- 
--  QKeySequence ctrl_shift = ctrl + Qt::ShiftModifier;
--  QKeySequence ctrl_alt = ctrl + Qt::AltModifier;
-+	Qt::KeyboardModifiers ctrl_shift = ctrl | Qt::ShiftModifier;
-+	Qt::KeyboardModifiers ctrl_alt = ctrl | Qt::AltModifier;
- 
-   // actions of the main window
- 
-   // file
-   init (tr ("New File"), "main_file:new_file", QKeySequence::New);
-   init (tr ("New Function"), "main_file:new_function",
--        QKeySequence (ctrl_shift + Qt::Key_N));
-+        QKeySequence (ctrl_shift | Qt::Key_N));
-   init (tr ("New Figure"), "main_file:new_figure", QKeySequence ());
-   init (tr ("Open File"), "main_file:open_file", QKeySequence::Open);
-   init (tr ("Load Workspace"), "main_file:load_workspace", QKeySequence ());
-@@ -122,7 +122,7 @@ shortcut_manager::do_init_data ()
-   init (tr ("Select All"), "main_edit:select_all", QKeySequence ());
-   init (tr ("Clear Clipboard"), "main_edit:clear_clipboard", QKeySequence ());
-   init (tr ("Find in Files"), "main_edit:find_in_files",
--        QKeySequence (ctrl_shift + Qt::Key_F));
-+        QKeySequence (ctrl_shift | Qt::Key_F));
-   init (tr ("Clear Command Window"), "main_edit:clear_command_window",
-         QKeySequence ());
-   init (tr ("Clear Command History"), "main_edit:clear_history",
-@@ -132,41 +132,41 @@ shortcut_manager::do_init_data ()
- 
-   // debug
-   init (tr ("Step"), "main_debug:step_over",
--        QKeySequence (prefix + Qt::Key_F10));
-+        QKeySequence (prefix | Qt::Key_F10));
-   init (tr ("Step Into"), "main_debug:step_into",
--        QKeySequence (prefix + Qt::Key_F11));
-+        QKeySequence (prefix | Qt::Key_F11));
-   init (tr ("Step Out"), "main_debug:step_out",
--        QKeySequence (prefix + Qt::ShiftModifier + Qt::Key_F11));
-+        QKeySequence (prefix | Qt::ShiftModifier | Qt::Key_F11));
-   init (tr ("Continue"), "main_debug:continue",
--        QKeySequence (prefix + Qt::Key_F5));
-+        QKeySequence (prefix | Qt::Key_F5));
-   init (tr ("Quit Debug Mode"), "main_debug:quit",
--        QKeySequence (prefix + Qt::ShiftModifier + Qt::Key_F5));
-+        QKeySequence (prefix | Qt::ShiftModifier | Qt::Key_F5));
- 
-   // window
-   init (tr ("Show Command Window"), "main_window:show_command",
--        prefix + ctrl_shift + Qt::Key_0);
-+	      QKeySequence (prefix | ctrl_shift | Qt::Key_0));
-   init (tr ("Show Command History"), "main_window:show_history",
--        prefix + ctrl_shift + Qt::Key_1);
-+        QKeySequence (prefix | ctrl_shift | Qt::Key_1));
-   init (tr ("Show File Browser"), "main_window:show_file_browser",
--        prefix + ctrl_shift + Qt::Key_2);
-+        QKeySequence (prefix | ctrl_shift | Qt::Key_2));
-   init (tr ("Show Workspace"), "main_window:show_workspace",
--        prefix + ctrl_shift + Qt::Key_3);
-+        QKeySequence (prefix | ctrl_shift | Qt::Key_3));
-   init (tr ("Show Editor"), "main_window:show_editor",
--        prefix + ctrl_shift + Qt::Key_4);
-+        QKeySequence (prefix | ctrl_shift | Qt::Key_4));
-   init (tr ("Show Documentation"), "main_window:show_doc",
--        prefix + ctrl_shift + Qt::Key_5);
-+        QKeySequence (prefix | ctrl_shift | Qt::Key_5));
-   init (tr ("Command Window"), "main_window:command",
--        prefix + ctrl + Qt::Key_0);
-+        QKeySequence (prefix | ctrl | Qt::Key_0));
-   init (tr ("Command History"), "main_window:history",
--        prefix + ctrl + Qt::Key_1);
-+        QKeySequence (prefix | ctrl | Qt::Key_1));
-   init (tr ("File Browser"), "main_window:file_browser",
--        prefix + ctrl + Qt::Key_2);
-+        QKeySequence (prefix | ctrl | Qt::Key_2));
-   init (tr ("Workspace"), "main_window:workspace",
--        prefix + ctrl + Qt::Key_3);
-+        QKeySequence (prefix | ctrl | Qt::Key_3));
-   init (tr ("Editor"), "main_window:editor",
--        prefix + ctrl + Qt::Key_4);
-+        QKeySequence (prefix | ctrl | Qt::Key_4));
-   init (tr ("Documentation"), "main_window:doc",
--        prefix + ctrl + Qt::Key_5);
-+        QKeySequence (prefix | ctrl | Qt::Key_5));
-   init (tr ("Reset Default Window Layout"), "main_window:reset", QKeySequence ());
- 
-   // help
-@@ -190,7 +190,7 @@ shortcut_manager::do_init_data ()
- 
-   // file
-   init (tr ("Edit Function"), "editor_file:edit_function",
--        QKeySequence (ctrl + Qt::Key_E));
-+        QKeySequence (ctrl | Qt::Key_E));
-   init (tr ("Save File"), "editor_file:save", QKeySequence::Save);
-   init (tr ("Save File As"), "editor_file:save_as", QKeySequence::SaveAs);
-   init (tr ("Close"), "editor_file:close", QKeySequence::Close);
-@@ -212,41 +212,41 @@ shortcut_manager::do_init_data ()
-   init (tr ("Delete to End of Word"), "editor_edit:delete_end_word",
-         QKeySequence::DeleteEndOfWord);
-   init (tr ("Delete to Start of Line"), "editor_edit:delete_start_line",
--        QKeySequence (ctrl_shift + Qt::Key_Backspace));
-+        QKeySequence (ctrl_shift | Qt::Key_Backspace));
-   init (tr ("Delete to End of Line"), "editor_edit:delete_end_line",
--        QKeySequence (ctrl_shift + Qt::Key_Delete));
-+        QKeySequence (ctrl_shift | Qt::Key_Delete));
-   init (tr ("Delete Line"), "editor_edit:delete_line",
--        QKeySequence (ctrl_shift + Qt::Key_L));
-+        QKeySequence (ctrl_shift | Qt::Key_L));
-   init (tr ("Copy Line"), "editor_edit:copy_line",
--        QKeySequence (ctrl_shift + Qt::Key_C));
-+        QKeySequence (ctrl_shift | Qt::Key_C));
-   init (tr ("Cut Line"), "editor_edit:cut_line",
--        QKeySequence (ctrl_shift + Qt::Key_X));
-+        QKeySequence (ctrl_shift | Qt::Key_X));
-   init (tr ("Duplicate Selection/Line"), "editor_edit:duplicate_selection",
--        QKeySequence (ctrl + Qt::Key_D));
-+        QKeySequence (ctrl | Qt::Key_D));
-   init (tr ("Transpose Line"), "editor_edit:transpose_line",
--        QKeySequence (ctrl + Qt::Key_T));
-+        QKeySequence (ctrl | Qt::Key_T));
-   init (tr ("Show Completion List"), "editor_edit:completion_list",
--        QKeySequence (ctrl + Qt::Key_Space));
-+        QKeySequence (ctrl | Qt::Key_Space));
- 
-   init (tr ("Comment Selection"), "editor_edit:comment_selection",
--        QKeySequence (ctrl + Qt::Key_R));
-+        QKeySequence (ctrl | Qt::Key_R));
-   init (tr ("Uncomment Selection"), "editor_edit:uncomment_selection",
--        QKeySequence (ctrl_shift + Qt::Key_R));
-+        QKeySequence (ctrl_shift | Qt::Key_R));
-   init (tr ("Uppercase Selection"), "editor_edit:upper_case",
--        QKeySequence (ctrl + Qt::Key_U));
-+        QKeySequence (ctrl | Qt::Key_U));
-   init (tr ("Lowercase Selection"), "editor_edit:lower_case",
--        QKeySequence (ctrl_alt + Qt::Key_U));
-+        QKeySequence (ctrl_alt | Qt::Key_U));
- 
- #if defined (Q_OS_MAC)
-   init (tr ("Indent Selection"), "editor_edit:indent_selection",
--        QKeySequence (prefix + Qt::Key_Tab));
-+        QKeySequence (prefix | Qt::Key_Tab));
-   init (tr ("Unindent Selection"), "editor_edit:unindent_selection",
--        QKeySequence (prefix + Qt::ShiftModifier + Qt::Key_Tab));
-+        QKeySequence (prefix | Qt::ShiftModifier | Qt::Key_Tab));
- #else
-   init (tr ("Indent Selection"), "editor_edit:indent_selection",
--        QKeySequence (ctrl + Qt::Key_Tab));
-+        QKeySequence (ctrl | Qt::Key_Tab));
-   init (tr ("Unindent Selection"), "editor_edit:unindent_selection",
--        QKeySequence (ctrl_shift + Qt::Key_Tab));
-+        QKeySequence (ctrl_shift | Qt::Key_Tab));
- #endif
- 
-   init (tr ("Convert Line Endings to Windows"), "editor_edit:conv_eol_winows",
-@@ -257,17 +257,17 @@ shortcut_manager::do_init_data ()
-         QKeySequence ());
- 
-   init (tr ("Goto Line"), "editor_edit:goto_line",
--        QKeySequence (ctrl + Qt::Key_G));
-+        QKeySequence (ctrl | Qt::Key_G));
-   init (tr ("Move to Matching Brace"), "editor_edit:move_to_brace",
--        QKeySequence (ctrl + Qt::Key_M));
-+        QKeySequence (ctrl | Qt::Key_M));
-   init (tr ("Select to Matching Brace"), "editor_edit:select_to_brace",
--        QKeySequence (ctrl_shift + Qt::Key_M));
-+        QKeySequence (ctrl_shift | Qt::Key_M));
-   init (tr ("Toggle Bookmark"), "editor_edit:toggle_bookmark",
--        QKeySequence (prefix + Qt::Key_F7));
-+        QKeySequence (prefix | Qt::Key_F7));
-   init (tr ("Next Bookmark"), "editor_edit:next_bookmark",
--        QKeySequence (prefix + Qt::Key_F2));
-+        QKeySequence (prefix | Qt::Key_F2));
-   init (tr ("Previous Bookmark"), "editor_edit:previous_bookmark",
--        QKeySequence (prefix + Qt::SHIFT + Qt::Key_F2));
-+        QKeySequence (prefix | Qt::SHIFT | Qt::Key_F2));
-   init (tr ("Remove All Bookmark"), "editor_edit:remove_bookmark",
-         QKeySequence ());
- 
-@@ -289,10 +289,10 @@ shortcut_manager::do_init_data ()
-   init (tr ("Zoom Out"), "editor_view:zoom_out", QKeySequence::ZoomOut);
- #if defined (Q_OS_MAC)
-   init (tr ("Zoom Normal"), "editor_view:zoom_normal",
--        QKeySequence (ctrl + Qt::Key_Underscore));
-+        QKeySequence (ctrl | Qt::Key_Underscore));
- #else
-   init (tr ("Zoom Normal"), "editor_view:zoom_normal",
--        QKeySequence (ctrl + Qt::Key_Period));
-+        QKeySequence (ctrl | Qt::Key_Period));
- #endif
- 
-   // debug
-@@ -307,15 +307,15 @@ shortcut_manager::do_init_data ()
- 
-   // run
-   init (tr ("Run File"), "editor_run:run_file",
--        QKeySequence (prefix + Qt::Key_F5) );
-+        QKeySequence (prefix | Qt::Key_F5) );
-   init (tr ("Run Selection"), "editor_run:run_selection",
--        QKeySequence (prefix + Qt::Key_F9) );
-+        QKeySequence (prefix | Qt::Key_F9) );
- 
-   // help
-   init (tr ("Help on Keyword"), "editor_help:help_keyword",
-         QKeySequence::HelpContents);
-   init (tr ("Document on Keyword"), "editor_help:doc_keyword",
--        QKeySequence (Qt::SHIFT + Qt::Key_F1));
-+        QKeySequence (Qt::SHIFT | Qt::Key_F1));
- }
- 
- void
-@@ -353,7 +353,7 @@ shortcut_manager::do_fill_treewidget (QT
-   _dialog = 0;
-   _level_hash.clear ();
- 
--  tree_view->header ()->setResizeMode (QHeaderView::ResizeToContents);
-+  tree_view->header ()->sectionResizeMode (QHeaderView::ResizeToContents);
- 
-   QTreeWidgetItem *main = new QTreeWidgetItem (tree_view);
-   main->setText (0, tr ("Main"));
-@@ -419,10 +419,10 @@ shortcut_manager::do_fill_treewidget (QT
- 
-       // write the shortcuts
-       tree_item->setText (0, sc.description);
--      tree_item->setText (1, sc.default_sc [0]);
--      tree_item->setText (2, sc.actual_sc [0]);
--      tree_item->setText (3, sc.default_sc [1]);
--      tree_item->setText (4, sc.actual_sc [1]);
-+      tree_item->setText (1, sc.default_sc [0].toString(QKeySequence::NativeText));
-+      tree_item->setText (2, sc.actual_sc [0].toString(QKeySequence::NativeText));
-+      tree_item->setText (3, sc.default_sc [1].toString(QKeySequence::NativeText));
-+      tree_item->setText (4, sc.actual_sc [1].toString(QKeySequence::NativeText));
- 
-       _item_index_hash[tree_item] = i + 1; // index+1 to avoid 0
-       _index_item_hash[i] = tree_item;
-@@ -569,8 +569,8 @@ shortcut_manager::shortcut_dialog (int i
- 
-     }
- 
--  _edit_actual->setText (_sc.at (index).actual_sc[_selected_set]);
--  _label_default->setText (_sc.at (index).default_sc[_selected_set]);
-+  _edit_actual->setText (_sc.at (index).actual_sc[_selected_set].toString(QKeySequence::NativeText));
-+  _label_default->setText (_sc.at (index).default_sc[_selected_set].toString(QKeySequence::NativeText));
-   _handled_index = index;
- 
-   _edit_actual->setFocus ();
-@@ -611,7 +611,7 @@ shortcut_manager::shortcut_dialog_finish
-           shortcut_t double_shortcut = _sc.at (double_index);
-           double_shortcut.actual_sc[_selected_set] = QKeySequence ();
-           _sc.replace (double_index, double_shortcut);
--          _index_item_hash[double_index]->setText ((_selected_set + 1)*2, QKeySequence ());
-+          _index_item_hash[double_index]->setText ((_selected_set + 1)*2, QKeySequence ().toString(QKeySequence::NativeText));
-         }
-       else
-         return;
-@@ -625,7 +625,7 @@ shortcut_manager::shortcut_dialog_finish
-   _sc.replace (_handled_index, shortcut);
- 
-   _index_item_hash[_handled_index]->setText ((_selected_set + 1)*2,
--                                             shortcut.actual_sc[_selected_set]);
-+                                             shortcut.actual_sc[_selected_set].toString(QKeySequence::NativeText));
- 
-   if (! shortcut.actual_sc[_selected_set].isEmpty ())
-     _shortcut_hash[widget + sep + shortcut.actual_sc[_selected_set].toString ()] =
-@@ -653,7 +653,7 @@ shortcut_manager::import_shortcuts (int 
- 
-       // update the tree view
-       QTreeWidgetItem* tree_item = _index_item_hash[i]; // get related tree item
--      tree_item->setText (2*set, sc.actual_sc [set-1]); // display new shortcut
-+      tree_item->setText (2*set, sc.actual_sc [set-1].toString(QKeySequence::NativeText)); // display new shortcut
-     }
- }
- 
-@@ -744,6 +744,6 @@ enter_shortcut::keyPressEvent (QKeyEvent
-       if (modifiers & Qt::MetaModifier)
-         key += Qt::META;
- 
--      setText (QKeySequence(key));
-+      setText (QKeySequence(key).toString(QKeySequence::NativeText));
-     }
- }
diff --git a/math/octave/patches/patch-libgui_src_workspace-model.cc b/math/octave/patches/patch-libgui_src_workspace-model.cc
deleted file mode 100644
index 39697810daf..00000000000
--- a/math/octave/patches/patch-libgui_src_workspace-model.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-libgui_src_workspace-model.cc,v 1.2 2016/08/06 13:03:35 prlw1 Exp $
-
-Changes for compiling with Qt5 instead of Qt4
-
---- libgui/src/workspace-model.cc.orig	2015-05-23 14:21:53.000000000 +0000
-+++ libgui/src/workspace-model.cc
-@@ -132,7 +132,7 @@ workspace_model::data (const QModelIndex
-         {
-           QString class_chars = resource_manager::storage_class_chars ();
-           int actual_class
--            = class_chars.indexOf (_scopes[idx.row ()].toAscii ());
-+            = class_chars.indexOf (_scopes[idx.row ()].toLatin1 ());
-           if (actual_class >= 0)
-             return QVariant (_storage_class_colors.at (actual_class));
-           else
-@@ -172,7 +172,7 @@ workspace_model::data (const QModelIndex
-                 QString class_chars = resource_manager::storage_class_chars ();
- 
-                 int actual_class
--                  = class_chars.indexOf (_scopes[idx.row ()].toAscii ());
-+                  = class_chars.indexOf (_scopes[idx.row ()].toLatin1 ());
- 
-                 if (actual_class >= 0)
-                   {
diff --git a/math/octave/patches/patch-libgui_src_workspace-view.cc b/math/octave/patches/patch-libgui_src_workspace-view.cc
deleted file mode 100644
index 4fbf5702f37..00000000000
--- a/math/octave/patches/patch-libgui_src_workspace-view.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-libgui_src_workspace-view.cc,v 1.1 2016/08/06 13:03:35 prlw1 Exp $
-
-Changes for compiling with Qt5 instead of Qt4
-
---- libgui/src/workspace-view.cc.orig	2016-04-20 18:23:57.000000000 +0000
-+++ libgui/src/workspace-view.cc
-@@ -98,8 +98,8 @@ workspace_view::workspace_view (QWidget 
-   view->horizontalHeader ()->restoreState (
-     settings->value ("workspaceview/column_state").toByteArray ());
-   // Set header properties for sorting
--  view->horizontalHeader ()->setClickable (true);
--  view->horizontalHeader ()->setMovable (true);
-+  view->horizontalHeader ()->setSectionsClickable (true);
-+  view->horizontalHeader ()->setSectionsMovable (true);
-   view->horizontalHeader ()->setSortIndicator (
-     settings->value ("workspaceview/sort_by_column",0).toInt (),
-     static_cast<Qt::SortOrder>
diff --git a/math/octave/patches/patch-libinterp_Makefile.in b/math/octave/patches/patch-libinterp_Makefile.in
deleted file mode 100644
index bea094443a3..00000000000
--- a/math/octave/patches/patch-libinterp_Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-libinterp_Makefile.in,v 1.1 2016/02/16 04:21:40 dbj Exp $
-
-install .oct loadable modules with INSTALL_LIB to avoid stripping them
-
---- libinterp/Makefile.in.orig	2015-05-26 16:21:46.000000000 +0000
-+++ libinterp/Makefile.in
-@@ -2009,6 +2009,7 @@ INCLUDE_NEXT = @INCLUDE_NEXT@
- INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_LIB = @INSTALL_LIB@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-@@ -8760,7 +8761,7 @@ corefcn/oct-tex-parser.yy: corefcn/oct-t
- 	$(AM_V_GEN)$(call subst-bison-api-decls,octave_tex_)
- 
- @AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@%.oct : %.la
--@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@	$(AM_V_GEN)$(INSTALL_PROGRAM) dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@
-+@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@	$(AM_V_GEN)$(INSTALL_LIB) dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@
- dldfcn/__delaunayn__.df: CPPFLAGS += $(QHULL_CPPFLAGS)
- dldfcn/__eigs__.df: CPPFLAGS += $(ARPACK_CPPFLAGS) $(SPARSE_XCPPFLAGS)
- dldfcn/__fltk_uigetfile__.df: CPPFLAGS += $(FLTK_CPPFLAGS) $(FT2_CPPFLAGS)
-@@ -8868,7 +8869,7 @@ uninstall-local: uninstall-oct uninstall
- @AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@	  f=`echo $$ltlib | $(SED) 's,.*/,,'`; \
- @AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@	  dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \
- @AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@	  if [ -n "$$dl" ]; then \
--@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@	    $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
-+@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@	    $(INSTALL_LIB) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
- @AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@	  else \
- @AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@	    echo "error: dlname is empty in $$ltlib!"; \
- @AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@	    exit 1; \
diff --git a/math/octave/patches/patch-libinterp_build-env.in.cc b/math/octave/patches/patch-libinterp_build-env.in.cc
new file mode 100644
index 00000000000..b58b85249e4
--- /dev/null
+++ b/math/octave/patches/patch-libinterp_build-env.in.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-libinterp_build-env.in.cc,v 1.1 2016/11/19 21:53:12 maya Exp $
+
+--- libinterp/build-env.in.cc.orig	2016-11-13 15:16:10.000000000 +0000
++++ libinterp/build-env.in.cc
+@@ -305,7 +305,7 @@ namespace octave
+ 
+     const char *Z_LIBS = %OCTAVE_CONF_Z_LIBS%;
+ 
+-    const char *config_opts = %OCTAVE_CONF_config_opts%;
++    const char *config_opts = "";
+   }
+ }
+ 
diff --git a/math/octave/patches/patch-libinterp_corefcn_rand.cc b/math/octave/patches/patch-libinterp_corefcn_rand.cc
deleted file mode 100644
index 765aab961ff..00000000000
--- a/math/octave/patches/patch-libinterp_corefcn_rand.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-libinterp_corefcn_rand.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
-
---- libinterp/corefcn/rand.cc.orig	2015-05-23 14:21:53.000000000 +0000
-+++ libinterp/corefcn/rand.cc
-@@ -1139,10 +1139,10 @@ likely.\n\
- @end deftypefn")
- {
- 
--#ifdef USE_UNORDERED_MAP_WITH_TR1
--using std::tr1::unordered_map;
--#else
-+#if defined (HAVE_UNORDERED_MAP)
- using std::unordered_map;
-+#else
-+using std::tr1::unordered_map;
- #endif
- 
-   int nargin = args.length ();
diff --git a/math/octave/patches/patch-libinterp_dldfcn_config-module.awk b/math/octave/patches/patch-libinterp_dldfcn_config-module.awk
index 33d533dc7e9..ebbb01cd1ce 100644
--- a/math/octave/patches/patch-libinterp_dldfcn_config-module.awk
+++ b/math/octave/patches/patch-libinterp_dldfcn_config-module.awk
@@ -1,15 +1,15 @@
-$NetBSD: patch-libinterp_dldfcn_config-module.awk,v 1.1 2016/02/16 04:21:40 dbj Exp $
+$NetBSD: patch-libinterp_dldfcn_config-module.awk,v 1.2 2016/11/19 21:53:12 maya Exp $
 
 install .oct loadable modules with INSTALL_LIB to avoid stripping them
 
---- libinterp/dldfcn/config-module.awk.orig	2015-05-23 14:21:53.000000000 +0000
+--- libinterp/dldfcn/config-module.awk.orig	2016-11-13 15:16:10.000000000 +0000
 +++ libinterp/dldfcn/config-module.awk
 @@ -39,7 +39,7 @@ BEGIN {
    print "## of symbolic links";
    print "";
    print "%.oct : %.la"
--  print "	$(AM_V_GEN)$(INSTALL_PROGRAM) dldfcn/.libs/$(shell $(SED) -n -e \"s/dlname='\\([^']*\\)'/\\1/p\" < $<) $@"
-+  print "	$(AM_V_GEN)$(INSTALL_LIB) dldfcn/.libs/$(shell $(SED) -n -e \"s/dlname='\\([^']*\\)'/\\1/p\" < $<) $@"
+-  print "	$(AM_V_GEN)$(INSTALL_PROGRAM) libinterp/dldfcn/.libs/$(shell $(SED) -n -e \"s/dlname='\\([^']*\\)'/\\1/p\" < $<) $@"
++  print "	$(AM_V_GEN)$(INSTALL_LIB) libinterp/dldfcn/.libs/$(shell $(SED) -n -e \"s/dlname='\\([^']*\\)'/\\1/p\" < $<) $@"
    print ""
    print "else";
    print "";
diff --git a/math/octave/patches/patch-libinterp_dldfcn_module.mk b/math/octave/patches/patch-libinterp_dldfcn_module.mk
index 165d09cc90c..2bd8d9d7265 100644
--- a/math/octave/patches/patch-libinterp_dldfcn_module.mk
+++ b/math/octave/patches/patch-libinterp_dldfcn_module.mk
@@ -1,15 +1,15 @@
-$NetBSD: patch-libinterp_dldfcn_module.mk,v 1.1 2016/02/16 04:21:40 dbj Exp $
+$NetBSD: patch-libinterp_dldfcn_module.mk,v 1.2 2016/11/19 21:53:12 maya Exp $
 
 install .oct loadable modules with INSTALL_LIB to avoid stripping them
 
---- libinterp/dldfcn/module.mk.orig	2015-05-23 14:36:42.000000000 +0000
+--- libinterp/dldfcn/module.mk.orig	2016-11-13 15:22:17.000000000 +0000
 +++ libinterp/dldfcn/module.mk
 @@ -39,7 +39,7 @@ octlib_LTLIBRARIES += $(DLDFCN_LIBS)
  ## of symbolic links
  
  %.oct : %.la
--	$(AM_V_GEN)$(INSTALL_PROGRAM) dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@
-+	$(AM_V_GEN)$(INSTALL_LIB) dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@
+-	$(AM_V_GEN)$(INSTALL_PROGRAM) libinterp/dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@
++	$(AM_V_GEN)$(INSTALL_LIB) libinterp/dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@
  
  else
  
diff --git a/math/octave/patches/patch-libinterp_Makefile.am b/math/octave/patches/patch-libinterp_module.mk
index 07645efd5ed..088a550cf76 100644
--- a/math/octave/patches/patch-libinterp_Makefile.am
+++ b/math/octave/patches/patch-libinterp_module.mk
@@ -1,10 +1,10 @@
-$NetBSD: patch-libinterp_Makefile.am,v 1.1 2016/02/16 04:21:40 dbj Exp $
+$NetBSD: patch-libinterp_module.mk,v 1.1 2016/11/19 21:53:12 maya Exp $
 
 install .oct loadable modules with INSTALL_LIB to avoid stripping them
 
---- libinterp/Makefile.am.orig	2015-05-23 14:21:53.000000000 +0000
-+++ libinterp/Makefile.am
-@@ -351,7 +351,7 @@ install-oct:
+--- libinterp/module.mk.orig	2016-11-13 15:16:10.000000000 +0000
++++ libinterp/module.mk
+@@ -306,7 +306,7 @@ install-oct:
  	  f=`echo $$ltlib | $(SED) 's,.*/,,'`; \
  	  dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \
  	  if [ -n "$$dl" ]; then \
diff --git a/math/octave/patches/patch-libinterp_oct-conf.in.h b/math/octave/patches/patch-libinterp_oct-conf.in.h
deleted file mode 100644
index e194fdc4915..00000000000
--- a/math/octave/patches/patch-libinterp_oct-conf.in.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libinterp_oct-conf.in.h,v 1.1 2016/02/16 04:21:40 dbj Exp $
-
---- libinterp/oct-conf.in.h.orig	2015-05-23 14:21:53.000000000 +0000
-+++ libinterp/oct-conf.in.h
-@@ -631,7 +631,7 @@ along with Octave; see the file COPYING.
- #endif
- 
- #ifndef OCTAVE_CONF_config_opts
--#define OCTAVE_CONF_config_opts %OCTAVE_CONF_config_opts%
-+#define OCTAVE_CONF_config_opts ""
- #endif
- 
- #endif
diff --git a/math/octave/patches/patch-liboctave_numeric_oct-fftw.h b/math/octave/patches/patch-liboctave_numeric_oct-fftw.h
deleted file mode 100644
index d4c13e28f5f..00000000000
--- a/math/octave/patches/patch-liboctave_numeric_oct-fftw.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-liboctave_numeric_oct-fftw.h,v 1.1 2016/02/16 04:21:40 dbj Exp $
-
---- liboctave/numeric/oct-fftw.h.orig	2015-05-23 14:21:53.000000000 +0000
-+++ liboctave/numeric/oct-fftw.h
-@@ -99,7 +99,7 @@ public:
-     return instance_ok () ? instance->do_method (_meth) : dummy;
-   }
- 
--#if defined (HAVE_FFTW3F_THREADS)
-+#if defined (HAVE_FFTW3_THREADS)
-   static void threads (int _nthreads)
-   {
-     if (instance_ok () && _nthreads != threads ())
diff --git a/math/octave/patches/patch-liboctave_operators_mx-inlines.cc b/math/octave/patches/patch-liboctave_operators_mx-inlines.cc
index da22ca77448..071e3a5393c 100644
--- a/math/octave/patches/patch-liboctave_operators_mx-inlines.cc
+++ b/math/octave/patches/patch-liboctave_operators_mx-inlines.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-liboctave_operators_mx-inlines.cc,v 1.2 2016/11/19 00:47:08 maya Exp $
+$NetBSD: patch-liboctave_operators_mx-inlines.cc,v 1.3 2016/11/19 21:53:12 maya Exp $
 
 std::pow is required to promote numeric arguments to the smallest
 common float type. octave_int<> provides another test of template
@@ -8,13 +8,13 @@ The combination of both leads to ambiguous resolutions.
 https://savannah.gnu.org/bugs/?43298
 https://llvm.org/bugs/show_bug.cgi?id=21083
 
---- liboctave/operators/mx-inlines.cc.orig	2015-05-23 14:21:53.000000000 +0000
+--- liboctave/operators/mx-inlines.cc.orig	2016-11-13 15:16:10.000000000 +0000
 +++ liboctave/operators/mx-inlines.cc
-@@ -307,7 +307,6 @@ inline void F (size_t n, R *r, X x, cons
+@@ -398,7 +398,6 @@ DEFMINMAXSPEC (float, mx_inline_xmax, >=
  
  // Let the compiler decide which pow to use, whichever best matches the
  // arguments provided.
 -using std::pow;
  DEFMXMAPPER2X (mx_inline_pow, pow)
  
- // Arbitrary function appliers. The function is a template parameter to enable
+ // Arbitrary function appliers.
diff --git a/math/octave/patches/patch-liboctave_system_oct-time.cc b/math/octave/patches/patch-liboctave_system_oct-time.cc
deleted file mode 100644
index 97ebea3a28e..00000000000
--- a/math/octave/patches/patch-liboctave_system_oct-time.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-liboctave_system_oct-time.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
-
---- liboctave/system/oct-time.cc.orig	2015-05-23 14:21:53.000000000 +0000
-+++ liboctave/system/oct-time.cc
-@@ -85,7 +85,7 @@ octave_time::stamp (void)
- {
-   struct timeval tp;
- 
--  gnulib::gettimeofday (&tp, 0);
-+  gettimeofday (&tp, 0);
- 
-   ot_unix_time = tp.tv_sec;
-   ot_usec = tp.tv_usec;
diff --git a/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.c b/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.c
new file mode 100644
index 00000000000..0afb7ee11b4
--- /dev/null
+++ b/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-liboctave_wrappers_strftime-wrapper.c,v 1.1 2016/11/19 21:53:12 maya Exp $
+
+Don't have struct tm_zone (in netbsd), instead use timezone_t as libgnu does
+
+--- liboctave/wrappers/strftime-wrapper.c.orig	2016-11-13 15:16:10.000000000 +0000
++++ liboctave/wrappers/strftime-wrapper.c
+@@ -36,7 +36,7 @@ along with Octave; see the file COPYING.
+ 
+ size_t
+ octave_strftime_wrapper (char *buf, size_t len, const char *fmt,
+-                         const struct tm *t, struct tm_zone *tz, int ns)
++                         const struct tm *t, timezone_t *tz, int ns)
+ {
+   return nstrftime (buf, len, fmt, t, tz, ns);
+ }
diff --git a/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.h b/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.h
new file mode 100644
index 00000000000..cd4f983b5ad
--- /dev/null
+++ b/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-liboctave_wrappers_strftime-wrapper.h,v 1.1 2016/11/19 21:53:12 maya Exp $
+
+Don't have struct tm_zone (in netbsd), instead use timezone_t as libgnu does
+
+--- liboctave/wrappers/strftime-wrapper.h.orig	2016-11-13 15:16:10.000000000 +0000
++++ liboctave/wrappers/strftime-wrapper.h
+@@ -35,7 +35,7 @@ extern "C" {
+ 
+ extern size_t
+ octave_strftime_wrapper (char *buf, size_t len, const char *fmt,
+-                         const struct tm *t, struct tm_zone *tz, int ns);
++                         const struct tm *t, timezone_t *tz, int ns);
+ 
+ #if defined __cplusplus
+ }