$NetBSD: patch-m4_acinclude.m4,v 1.7 2024/03/24 12:46:23 adam Exp $

we pass and assume a given MACHINE_GNU_PLATFORM, but this package did not
use this value due to an error.
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

Do not look for qcollectiongenerator; it is now part of qhelpgenerator.

On Darwin, do not produce a mach-o bundle.

--- m4/acinclude.m4.orig	2024-03-12 18:00:23.000000000 +0000
+++ m4/acinclude.m4
@@ -36,7 +36,7 @@ AC_DEFUN([OCTAVE_CANONICAL_HOST], [
     host=unknown-unknown-unknown
     AC_MSG_WARN([configuring Octave for unknown system type])
   fi
-  canonical_host_type=$host
+  canonical_host_type=$host_alias
   AC_SUBST(canonical_host_type)
   if test -z "$host_cpu"; then
     host_cpu=unknown
@@ -2149,17 +2149,10 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_
     OCTAVE_CHECK_QT_TOOL([rcc])
     OCTAVE_CHECK_QT_TOOL([lrelease])
     OCTAVE_CHECK_QT_TOOL([qhelpgenerator])
-    case "$qt_version" in
-      5)
-        OCTAVE_CHECK_QT_TOOL([qcollectiongenerator])
-      ;;
-      6)
-        QCOLLECTIONGENERATOR="$QHELPGENERATOR"
-      ;;
-    esac
+    QCOLLECTIONGENERATOR="$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=
@@ -2749,8 +2742,6 @@ AC_DEFUN_ONCE([OCTAVE_DEFINE_MKOCTFILE_D
       dnl Contains variables that are defined and undefined at this point,
       dnl so use appropriate quoting to defer expansion of
       dnl ${abs_top_builddir}, ${bindir}, and ${version}.
-      DL_LDFLAGS='-bundle -undefined dynamic_lookup -bind_at_load -bundle_loader ${abs_top_builddir}/src/octave'"${EXEEXT} ${LDFLAGS}"
-      MKOCTFILE_DL_LDFLAGS='-bundle -undefined dynamic_lookup -bind_at_load -bundle_loader ${bindir}/octave-${version}'"${EXEEXT}"
       SH_LDFLAGS="-dynamiclib -single_module ${LDFLAGS}"
       case $canonical_host_type in
         powerpc-*)