$NetBSD: patch-configure,v 1.8 2018/12/26 10:45:46 adam Exp $

Regen.

install .oct loadable modules with INSTALL_LIB to avoid stripping them

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

Allow overriding MKOCTFILE_F77 so we can provide the full path to gfortran
(for building octave-forge packages like control)

Additional changes are due to autoconf changes.

--- configure.orig	2018-08-09 18:20:32.000000000 +0000
+++ configure
@@ -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
+runstatedir
 lispdir
 REPLACE_FDOPENDIR
 REPLACE_DIRFD
@@ -2092,6 +2089,7 @@ PYTHON
 DEFAULT_PAGER
 GNUPLOT
 GHOSTSCRIPT
+INSTALL_LIB
 LN_S
 REPRODUCIBLE_TAR_FLAGS
 TEXI2PDF
@@ -2221,7 +2219,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -2446,7 +2443,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -2699,15 +2695,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -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 \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -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]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -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
 
 
 
-INSTALL_SCRIPT="${INSTALL}"
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL_SCRIPT}'
+
 
 
 ## Programs used when running Octave.
@@ -12974,6 +12963,11 @@ fi
 	  done
 	  ;;
 	-[lLR]*)
+	    case $ac_arg in
+	    -R*)
+	        ac_arg="-Wl,$ac_arg"
+	        ;;
+	    esac
 	    ac_exists=false
   for ac_i in $ac_cv_f77_libs; do
     if test x"$ac_arg" = x"$ac_i"; then
@@ -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
-  MKOCTFILE_AR="$AR"
-  MKOCTFILE_CC="$CC"
-  MKOCTFILE_CXX="$CXX"
-  MKOCTFILE_DL_LD="$DL_LD"
-  MKOCTFILE_F77="$F77"
-  MKOCTFILE_LD_CXX="$LD_CXX"
-  MKOCTFILE_RANLIB="$RANLIB"
+  MKOCTFILE_AR="${MKOCTFILE_AR-$AR}"
+  MKOCTFILE_CC="${MKOCTFILE_CC-$CC}"
+  MKOCTFILE_CXX="${MKOCTFILE_CXX-$CXX}"
+  MKOCTFILE_DL_LD="${MKOCTFILE_DL_LD-$DL_LD}"
+  MKOCTFILE_F77="${MKOCTFILE_F77-$F77}"
+  MKOCTFILE_LD_CXX="${MKOCTFILE_LD_CXX-$LD_CXX}"
+  MKOCTFILE_RANLIB="${MKOCTFILE_RANLIB-$RANLIB}"
 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 +36085,8 @@ else
 # ifdef _MSC_VER
 #  include <malloc.h>
 #  define alloca _alloca
+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+#   include <stdlib.h>
 # 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=
