octave: fix building with recent Qt5

Do not look for qcollectiongenerator, it has been incorporared into qhelpgenerator.

5 files changed, 303 insertions, 31 deletions

diff --git a/math/octave/Makefile b/math/octave/Makefile
index a994ef9ced6..c196f682978 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.183 2018/12/13 19:52:09 adam Exp $
+# $NetBSD: Makefile,v 1.184 2018/12/26 10:45:46 adam Exp $
 
 DISTNAME=	octave-4.4.1
 PKGREVISION=	6
@@ -16,7 +16,7 @@ LICENSE=	gnu-gpl-v3
 #BUILD_DEPENDS+=	tex-epsf-[0-9]*:../../print/tex-epsf
 #BUILD_DEPENDS+=	tex-tex-[0-9]*:../../print/tex-tex
 #BUILD_DEPENDS+=	tex-pdftex-[0-9]*:../../print/tex-pdftex
-#TOOL_DEPENDS+=	gtexinfo>=5.1:../../devel/gtexinfo
+#TOOL_DEPENDS+=		gtexinfo>=5.1:../../devel/gtexinfo
 
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 
@@ -65,12 +65,8 @@ PRINT_PLIST_AWK+=	{ gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}");
 CHECK_WRKREF_SKIP+=	lib/octave/${PKGVERSION_NOREV}/liboctinterp*.${SHLIB_TYPE}* \
 			lib/octave/${PKGVERSION_NOREV}/liboctinterp.a
 
-
 TEST_TARGET=	check
 
-#pre-configure:
-#	cd ${WRKSRC} && autoconf
-
 SUBST_CLASSES+=			fix-make
 SUBST_STAGE.fix-make=		pre-configure
 SUBST_MESSAGE.fix-make=		Fixing path to gmake.
@@ -88,18 +84,12 @@ SUBST_SED.qt5-pkg-config+=	-e 's,QtOpenGL,Qt5OpenGL,g'
 
 # Matches reduce-relocations logic in x11/qt5-qtbase
 .if ${OPSYS} != "Darwin" && ${OPSYS} != "SunOS" && \
-      (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64))
+	${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == x86_64
 CFLAGS+=	-fPIC
 .endif
 
 PREPEND_PATH+=			${QTDIR}/bin
 
-MAKE_ENV+=			V=1
-
-#post-extract:
-#	find ${WRKSRC}/doc -type f -name '*.info*' -print | xargs rm -f
-#	mkdir ${WRKSRC}/src/pic
-
 post-install:
 .for f in ${OCTAVE_DOC}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/octave/${PKGVERSION_NOREV}/doc
diff --git a/math/octave/distinfo b/math/octave/distinfo
index 440dd641780..34933c19726 100644
--- a/math/octave/distinfo
+++ b/math/octave/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.54 2018/08/12 08:33:55 maya Exp $
+$NetBSD: distinfo,v 1.55 2018/12/26 10:45:46 adam Exp $
 
 SHA1 (octave-4.4.1.tar.gz) = 693fe46fdf49c62dec9f81100050ba2d2c1e4067
 RMD160 (octave-4.4.1.tar.gz) = 45d1efbd217308ff9a7b3354ccc004f37785a270
 SHA512 (octave-4.4.1.tar.gz) = 21a1f13e2145fa530f2169254d19442b572745d65b91453ba1f552f6eda6aecfead57dbe0260b3293a29db0aa0f27cfd4f26df332e6d640848a822b20c1232f8
 Size (octave-4.4.1.tar.gz) = 28626462 bytes
-SHA1 (patch-configure) = 4226f9c717ff13bff8508f14c229704388193057
+SHA1 (patch-configure) = f10abb7c15d7181da775fd8ccc824ef616cc2a32
 SHA1 (patch-configure.ac) = df35493bc99f8b133865d96f079f603a33ef5cc4
+SHA1 (patch-doc_interpreter_module.mk) = 66389cceddbe71fca0c8197275a839170d64ad5b
 SHA1 (patch-fseeko-fpos_t.c) = b38e7a38be2e0b323cd7f168f1d22d3df998691c
 SHA1 (patch-libgnu_stdio.in.h) = 112a424655d46c75fb68531fe7a84d9a0e97a984
 SHA1 (patch-libgui_src_settings-dialog.h) = 5bf82e5d313e06ec470a1da1a615c39f74bb880f
@@ -13,7 +14,7 @@ SHA1 (patch-libinterp_dldfcn_config-module.awk) = 4a6c7ee86a626a43b1c0c3514a5909
 SHA1 (patch-libinterp_dldfcn_module.mk) = 1ec48eb2115da9095a8d8fe9497b25c2bc41bd91
 SHA1 (patch-libinterp_module.mk) = 26889c064497eb2bcbd77199e96925f61359c128
 SHA1 (patch-liboctave_operators_mx-inlines.cc) = 67e9c8e9a3afe0339343087d68967ac6d9159bd5
-SHA1 (patch-m4_acinclude.m4) = 194b8c3cf6f5e45a0251b229af9b3a47c12aa608
+SHA1 (patch-m4_acinclude.m4) = 16dfa3a47403b0c6bc5935fdb5f1162a393b3f25
 SHA1 (patch-scripts_miscellaneous_unpack.m) = 82c9ca170762e223c8e5a6f88a7dd9fe2a2a33d0
 SHA1 (patch-scripts_pkg_private_configure__make.m) = 7d4b620f889faa66c4c9c581ef8a7e7692b68c94
 SHA1 (patch-scripts_plot_util_____gnuplot__drawnow____.m) = 449b178aefd78c5c1b03ffd960f2e8be3874efc2
diff --git a/math/octave/patches/patch-configure b/math/octave/patches/patch-configure
index d29871c1140..4e22fb0c106 100644
--- a/math/octave/patches/patch-configure
+++ b/math/octave/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.7 2018/08/12 08:33:55 maya Exp $
+$NetBSD: patch-configure,v 1.8 2018/12/26 10:45:46 adam Exp $
 
 Regen.
 
@@ -17,7 +17,18 @@ Additional changes are due to autoconf changes.
 
 --- configure.orig	2018-08-09 18:20:32.000000000 +0000
 +++ configure
-@@ -1733,6 +1733,7 @@ INCLUDE_NEXT_AS_FIRST_DIRECTIVE
+@@ -761,10 +761,6 @@ ac_ct_QHELPGENERATOR
+ QHELPGENERATOR
+ ac_ct_QHELPGENERATOR_QTVER
+ QHELPGENERATOR_QTVER
+-ac_ct_QCOLLECTIONGENERATOR
+-QCOLLECTIONGENERATOR
+-ac_ct_QCOLLECTIONGENERATOR_QTVER
+-QCOLLECTIONGENERATOR_QTVER
+ ac_ct_LRELEASE
+ LRELEASE
+ ac_ct_LRELEASE_QTVER
+@@ -1733,6 +1729,7 @@ INCLUDE_NEXT_AS_FIRST_DIRECTIVE
  INCLUDE_NEXT
  LIB_CRYPTO
  pkglibexecdir
@@ -25,7 +36,7 @@ Additional changes are due to autoconf changes.
  lispdir
  REPLACE_FDOPENDIR
  REPLACE_DIRFD
-@@ -2092,6 +2093,7 @@ PYTHON
+@@ -2092,6 +2089,7 @@ PYTHON
  DEFAULT_PAGER
  GNUPLOT
  GHOSTSCRIPT
@@ -33,7 +44,7 @@ Additional changes are due to autoconf changes.
  LN_S
  REPRODUCIBLE_TAR_FLAGS
  TEXI2PDF
-@@ -2221,7 +2223,6 @@ infodir
+@@ -2221,7 +2219,6 @@ infodir
  docdir
  oldincludedir
  includedir
@@ -41,7 +52,7 @@ Additional changes are due to autoconf changes.
  localstatedir
  sharedstatedir
  sysconfdir
-@@ -2446,7 +2447,6 @@ datadir='${datarootdir}'
+@@ -2446,7 +2443,6 @@ datadir='${datarootdir}'
  sysconfdir='${prefix}/etc'
  sharedstatedir='${prefix}/com'
  localstatedir='${prefix}/var'
@@ -49,7 +60,7 @@ Additional changes are due to autoconf changes.
  includedir='${prefix}/include'
  oldincludedir='/usr/include'
  docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-@@ -2699,15 +2699,6 @@ do
+@@ -2699,15 +2695,6 @@ do
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
  
@@ -65,7 +76,7 @@ Additional changes are due to autoconf changes.
    -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
      ac_prev=sbindir ;;
    -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-@@ -2845,7 +2836,7 @@ fi
+@@ -2845,7 +2832,7 @@ fi
  for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
  		datadir sysconfdir sharedstatedir localstatedir includedir \
  		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
@@ -74,7 +85,7 @@ Additional changes are due to autoconf changes.
  do
    eval ac_val=\$$ac_var
    # Remove trailing slashes.
-@@ -2998,7 +2989,6 @@ Fine tuning of the installation director
+@@ -2998,7 +2985,6 @@ Fine tuning of the installation director
    --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
    --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
    --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
@@ -82,7 +93,16 @@ Additional changes are due to autoconf changes.
    --libdir=DIR            object code libraries [EPREFIX/lib]
    --includedir=DIR        C header files [PREFIX/include]
    --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-@@ -9414,7 +9404,10 @@ fi
+@@ -6043,7 +6029,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
+-  canonical_host_type=$host
++  canonical_host_type=$host_alias
+ 
+   if test -z "$host_cpu"; then
+     host_cpu=unknown
+@@ -9414,7 +9400,10 @@ fi
  
  
  
@@ -94,7 +114,7 @@ Additional changes are due to autoconf changes.
  
  
  ## Programs used when running Octave.
-@@ -12974,6 +12967,11 @@ fi
+@@ -12974,6 +12963,11 @@ fi
  	  done
  	  ;;
  	-[lLR]*)
@@ -106,7 +126,7 @@ Additional changes are due to autoconf changes.
  	    ac_exists=false
    for ac_i in $ac_cv_f77_libs; do
      if test x"$ac_arg" = x"$ac_i"; then
-@@ -34971,13 +34969,13 @@ if test "$cross_compiling" = yes && test
+@@ -34971,13 +34965,13 @@ if test "$cross_compiling" = yes && test
    MKOCTFILE_LD_CXX=`echo "$LD_CXX" | $SED "s,$CROSS_TOOL_PREFIX,,"`
    MKOCTFILE_RANLIB=`echo "$RANLIB" | $SED "s,$CROSS_TOOL_PREFIX,,"`
  else
@@ -127,7 +147,7 @@ Additional changes are due to autoconf changes.
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX" >&5
  $as_echo "$as_me: defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX" >&6;}
-@@ -36091,6 +36089,8 @@ else
+@@ -36091,6 +36085,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -136,3 +156,234 @@ Additional changes are due to autoconf changes.
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
+@@ -71654,221 +71650,6 @@ fi
+ 
+ 
+   if test -n "$ac_tool_prefix"; then
+-  for ac_prog in qcollectiongenerator-qt$qt_version
+-  do
+-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_QCOLLECTIONGENERATOR_QTVER+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$QCOLLECTIONGENERATOR_QTVER"; then
+-  ac_cv_prog_QCOLLECTIONGENERATOR_QTVER="$QCOLLECTIONGENERATOR_QTVER" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_QCOLLECTIONGENERATOR_QTVER="$ac_tool_prefix$ac_prog"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-QCOLLECTIONGENERATOR_QTVER=$ac_cv_prog_QCOLLECTIONGENERATOR_QTVER
+-if test -n "$QCOLLECTIONGENERATOR_QTVER"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QCOLLECTIONGENERATOR_QTVER" >&5
+-$as_echo "$QCOLLECTIONGENERATOR_QTVER" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-    test -n "$QCOLLECTIONGENERATOR_QTVER" && break
+-  done
+-fi
+-if test -z "$QCOLLECTIONGENERATOR_QTVER"; then
+-  ac_ct_QCOLLECTIONGENERATOR_QTVER=$QCOLLECTIONGENERATOR_QTVER
+-  for ac_prog in qcollectiongenerator-qt$qt_version
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_QCOLLECTIONGENERATOR_QTVER"; then
+-  ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER="$ac_ct_QCOLLECTIONGENERATOR_QTVER" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER="$ac_prog"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_QCOLLECTIONGENERATOR_QTVER=$ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER
+-if test -n "$ac_ct_QCOLLECTIONGENERATOR_QTVER"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_QCOLLECTIONGENERATOR_QTVER" >&5
+-$as_echo "$ac_ct_QCOLLECTIONGENERATOR_QTVER" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-  test -n "$ac_ct_QCOLLECTIONGENERATOR_QTVER" && break
+-done
+-
+-  if test "x$ac_ct_QCOLLECTIONGENERATOR_QTVER" = x; then
+-    QCOLLECTIONGENERATOR_QTVER=""
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    QCOLLECTIONGENERATOR_QTVER=$ac_ct_QCOLLECTIONGENERATOR_QTVER
+-  fi
+-fi
+-
+-  if test -z "$QCOLLECTIONGENERATOR_QTVER"; then
+-    if test -n "$ac_tool_prefix"; then
+-  for ac_prog in qcollectiongenerator
+-  do
+-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_QCOLLECTIONGENERATOR+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$QCOLLECTIONGENERATOR"; then
+-  ac_cv_prog_QCOLLECTIONGENERATOR="$QCOLLECTIONGENERATOR" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_QCOLLECTIONGENERATOR="$ac_tool_prefix$ac_prog"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-QCOLLECTIONGENERATOR=$ac_cv_prog_QCOLLECTIONGENERATOR
+-if test -n "$QCOLLECTIONGENERATOR"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QCOLLECTIONGENERATOR" >&5
+-$as_echo "$QCOLLECTIONGENERATOR" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-    test -n "$QCOLLECTIONGENERATOR" && break
+-  done
+-fi
+-if test -z "$QCOLLECTIONGENERATOR"; then
+-  ac_ct_QCOLLECTIONGENERATOR=$QCOLLECTIONGENERATOR
+-  for ac_prog in qcollectiongenerator
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_QCOLLECTIONGENERATOR"; then
+-  ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR="$ac_ct_QCOLLECTIONGENERATOR" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR="$ac_prog"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_QCOLLECTIONGENERATOR=$ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR
+-if test -n "$ac_ct_QCOLLECTIONGENERATOR"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_QCOLLECTIONGENERATOR" >&5
+-$as_echo "$ac_ct_QCOLLECTIONGENERATOR" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-  test -n "$ac_ct_QCOLLECTIONGENERATOR" && break
+-done
+-
+-  if test "x$ac_ct_QCOLLECTIONGENERATOR" = x; then
+-    QCOLLECTIONGENERATOR=""
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    QCOLLECTIONGENERATOR=$ac_ct_QCOLLECTIONGENERATOR
+-  fi
+-fi
+-
+-    if test -n "$QCOLLECTIONGENERATOR"; then
+-      if test -n "$QTCHOOSER"; then
+-        QCOLLECTIONGENERATORFLAGS="-qt$qt_version"
+-      fi
+-      QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qcollectiongenerator"
+-    else
+-      QT_TOOLS_MISSING="$QT_TOOLS_MISSING qcollectiongenerator"
+-    fi
+-  else
+-    QCOLLECTIONGENERATOR="$QCOLLECTIONGENERATOR_QTVER"
+-    QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qcollectiongenerator"
+-  fi
+-
+-
+-  if test -n "$ac_tool_prefix"; then
+   for ac_prog in qhelpgenerator-qt$qt_version
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+@@ -72084,7 +71865,7 @@ fi
+ 
+ 
+     if test -n "$QT_TOOLS_MISSING"; then
+-      warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, qcollectiongenerator, and qhelpgenerator not found; disabling Qt GUI"
++      warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, and qhelpgenerator not found; disabling Qt GUI"
+       build_qt_gui=no
+       MOC_QTVER=
+       UIC_QTVER=
diff --git a/math/octave/patches/patch-doc_interpreter_module.mk b/math/octave/patches/patch-doc_interpreter_module.mk
new file mode 100644
index 00000000000..9908cb2fe56
--- /dev/null
+++ b/math/octave/patches/patch-doc_interpreter_module.mk
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_interpreter_module.mk,v 1.1 2018/12/26 10:45:46 adam Exp $
+
+Use QHELPGENERATOR instead of QCOLLECTIONGENERATOR.
+
+--- doc/interpreter/module.mk.orig	2018-12-25 23:35:44.000000000 +0000
++++ doc/interpreter/module.mk
+@@ -252,7 +252,7 @@ if AMCOND_BUILD_QT_DOCS
+ %.qhc %.qch : $(OCTAVE_HTML_STAMP) $(HTMLDIR_CSS) %reldir%/mk-qthelp.pl
+ 	$(AM_V_GEN)rm -f $(OCTAVE_QTHELP_FILES) && \
+ 	$(PERL) $(srcdir)/%reldir%/mk-qthelp.pl octave.html %reldir%/octave_interpreter && \
+-	$(QCOLLECTIONGENERATOR) $(QCOLLECTIONGENERATORFLAGS) %reldir%/octave_interpreter.qhcp -o %reldir%/octave_interpreter.qhc >/dev/null && \
++	$(QHELPGENERATOR) $(QHELPGENERATORFLAGS) %reldir%/octave_interpreter.qhcp -o %reldir%/octave_interpreter.qhc >/dev/null && \
+ 	rm -f %reldir%/octave_interpreter.qhcp %reldir%/octave_interpreter.qhp
+ 
+ endif
diff --git a/math/octave/patches/patch-m4_acinclude.m4 b/math/octave/patches/patch-m4_acinclude.m4
index ae84e59fb1b..4b02cc35bba 100644
--- a/math/octave/patches/patch-m4_acinclude.m4
+++ b/math/octave/patches/patch-m4_acinclude.m4
@@ -1,4 +1,4 @@
-$NetBSD: patch-m4_acinclude.m4,v 1.1 2016/09/28 02:54:15 maya Exp $
+$NetBSD: patch-m4_acinclude.m4,v 1.2 2018/12/26 10:45:46 adam Exp $
 
 we pass and assume a given MACHINE_GNU_PLATFORM, but this package did not
 use this value due to an error.
@@ -6,9 +6,11 @@ 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
 
---- m4/acinclude.m4.orig	2016-04-20 18:23:56.000000000 +0000
+Do not look for qcollectiongenerator; it is now part of qhelpgenerator.
+
+--- m4/acinclude.m4.orig	2018-08-09 18:20:32.000000000 +0000
 +++ m4/acinclude.m4
-@@ -1651,7 +1651,7 @@ AC_DEFUN([OCTAVE_CANONICAL_HOST], [
+@@ -31,7 +31,7 @@ AC_DEFUN([OCTAVE_CANONICAL_HOST], [
      host=unknown-unknown-unknown
      AC_MSG_WARN([configuring Octave for unknown system type])
    fi
@@ -17,3 +19,16 @@ https://mail-index.netbsd.org/pkgsrc-users/2014/03/26/msg019464.html
    AC_SUBST(canonical_host_type)
    if test -z "$host_cpu"; then
      host_cpu=unknown
+@@ -2011,11 +2011,10 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_
+     OCTAVE_CHECK_QT_TOOL([uic])
+     OCTAVE_CHECK_QT_TOOL([rcc])
+     OCTAVE_CHECK_QT_TOOL([lrelease])
+-    OCTAVE_CHECK_QT_TOOL([qcollectiongenerator])
+     OCTAVE_CHECK_QT_TOOL([qhelpgenerator])
+ 
+     if test -n "$QT_TOOLS_MISSING"; then
+-      warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, qcollectiongenerator, and qhelpgenerator not found; disabling Qt GUI"
++      warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, and qhelpgenerator not found; disabling Qt GUI"
+       build_qt_gui=no
+       MOC_QTVER=
+       UIC_QTVER=