octave: fix linux install

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) is different, and
this seems to trample over our own tools, see:
https://mail-index.netbsd.org/pkgsrc-users/2014/03/26/msg019464.html

add this patch to the original m4 script too, not just the resulting configure
file, so it won't be accidentially forgotten (and can be upstreamed).

patch originally by Iain Morgan
reminded by Dr. Thomas Orgis

3 files changed, 41 insertions, 6 deletions

diff --git a/math/octave/distinfo b/math/octave/distinfo
index 43a8c9b9431..9173a9c60fa 100644
--- a/math/octave/distinfo
+++ b/math/octave/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.47 2016/08/06 13:03:35 prlw1 Exp $
+$NetBSD: distinfo,v 1.48 2016/09/28 02:54:15 maya Exp $
 
 SHA1 (octave-4.0.3.tar.xz) = c798346a8271e0141d9dbe5610584dabb8311277
 RMD160 (octave-4.0.3.tar.xz) = 32bad5cdb6b832d651183b92f59b396940d6ec04
 SHA512 (octave-4.0.3.tar.xz) = bad009235b04be09c051dd27ebef7df2542adec0a0b57c070662deebe33a0cdceb7d6816653f5afc3fc0cc1287ba1ca1a5c50858169004210224039374c9c55d
 Size (octave-4.0.3.tar.xz) = 15697064 bytes
-SHA1 (patch-configure) = b79c490c85ca422fedf6ca7da472255196e00325
+SHA1 (patch-configure) = 95ba2b79dc816fdc912c19d04a3e5e1cee94089b
 SHA1 (patch-configure.ac) = d70f77d12a660bf9542725c8085fb525f138ce75
 SHA1 (patch-fflush-fpos_t.c) = 83d3d731042862920de68f0457fea4f95568125c
 SHA1 (patch-fseeko-fpos_t.c) = b38e7a38be2e0b323cd7f168f1d22d3df998691c
@@ -30,5 +30,6 @@ SHA1 (patch-libinterp_oct-conf.in.h) = 9a6b0e8d38bc2f9da916cb3d8145307e7a415f4f
 SHA1 (patch-liboctave_numeric_oct-fftw.h) = b152566ad3fcf6c5c1808f4428e6d51966ca1daf
 SHA1 (patch-liboctave_operators_mx-inlines.cc) = 3f01077700a3b8f51a3a171fdc11bafd784e3ea3
 SHA1 (patch-liboctave_system_oct-time.cc) = 7b8a33911c69861572e35320e13c6c777048bc6c
+SHA1 (patch-m4_acinclude.m4) = 194b8c3cf6f5e45a0251b229af9b3a47c12aa608
 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 94a379de76d..f5e41b6b463 100644
--- a/math/octave/patches/patch-configure
+++ b/math/octave/patches/patch-configure
@@ -1,10 +1,16 @@
-$NetBSD: patch-configure,v 1.3 2016/02/16 04:21:40 dbj Exp $
+$NetBSD: patch-configure,v 1.4 2016/09/28 02:54:15 maya Exp $
 
 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
+
 --- configure.orig	2015-05-26 16:21:37.000000000 +0000
 +++ configure
-@@ -1951,6 +1951,7 @@ DEFAULT_PAGER
+@@ -1952,6 +1952,7 @@ DEFAULT_PAGER
  GNUPLOT
  GHOSTSCRIPT
  DESKTOP_FILE_INSTALL
@@ -12,7 +18,16 @@ install .oct loadable modules with INSTALL_LIB to avoid stripping them
  LN_S
  TEXI2PDF
  TEXI2DVI
-@@ -8609,7 +8610,9 @@ fi
+@@ -5870,7 +5871,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
+@@ -8620,7 +8621,9 @@ fi
  
  
  
@@ -23,7 +38,7 @@ install .oct loadable modules with INSTALL_LIB to avoid stripping them
  
  
  
-@@ -13788,7 +13791,12 @@ else
+@@ -14005,7 +14008,12 @@ else
  fi
  	  done
  	  ;;
diff --git a/math/octave/patches/patch-m4_acinclude.m4 b/math/octave/patches/patch-m4_acinclude.m4
new file mode 100644
index 00000000000..ae84e59fb1b
--- /dev/null
+++ b/math/octave/patches/patch-m4_acinclude.m4
@@ -0,0 +1,19 @@
+$NetBSD: patch-m4_acinclude.m4,v 1.1 2016/09/28 02:54:15 maya 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
+
+--- m4/acinclude.m4.orig	2016-04-20 18:23:56.000000000 +0000
++++ m4/acinclude.m4
+@@ -1651,7 +1651,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