--- build-aux/subst-config-vals.in.sh.orig	2019-02-23 10:33:37.000000000 -0700
+++ build-aux/subst-config-vals.in.sh	2019-03-03 07:11:28.000000000 -0700
@@ -20,7 +20,7 @@
 
 : ${SED=@SED@}
 
-canonical_host_type="@canonical_host_type@"
+canonical_host_type="__MACPORTS_canonical_host_type__"
 DEFAULT_PAGER="@DEFAULT_PAGER@"
 EXEEXT="@EXEEXT@"
 man1ext="@man1ext@"
--- configure.orig	2019-03-03 07:08:47.000000000 -0700
+++ configure	2019-03-03 07:12:49.000000000 -0700
@@ -8510,7 +8510,7 @@
  ;;
   *)
 
-  : ${archlibdir='${libexecdir}/octave/${version}/exec/${canonical_host_type}'}
+  : ${archlibdir='${libexecdir}/octave/${version}/exec/__MACPORTS_canonical_host_type__'}
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining archlibdir to be $archlibdir" >&5
 printf "%s\n" "defining archlibdir to be $archlibdir" >&6; }
 
@@ -8520,21 +8520,21 @@
 ## Where to put executables to be run by Octave, rather than the user, that
 ## are specific to this site.
 
-  : ${localarchlibdir='${libexecdir}/octave/site/exec/${canonical_host_type}'}
+  : ${localarchlibdir='${libexecdir}/octave/site/exec/__MACPORTS_canonical_host_type__'}
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining localarchlibdir to be $localarchlibdir" >&5
 printf "%s\n" "defining localarchlibdir to be $localarchlibdir" >&6; }
 
 
 
 
-  : ${localapiarchlibdir='${libexecdir}/octave/${api_version}/site/exec/${canonical_host_type}'}
+  : ${localapiarchlibdir='${libexecdir}/octave/${api_version}/site/exec/__MACPORTS_canonical_host_type__'}
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining localapiarchlibdir to be $localapiarchlibdir" >&5
 printf "%s\n" "defining localapiarchlibdir to be $localapiarchlibdir" >&6; }
 
 
 
 
-  : ${localverarchlibdir='${libexecdir}/octave/${version}/site/exec/${canonical_host_type}'}
+  : ${localverarchlibdir='${libexecdir}/octave/${version}/site/exec/__MACPORTS_canonical_host_type__'}
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining localverarchlibdir to be $localverarchlibdir" >&5
 printf "%s\n" "defining localverarchlibdir to be $localverarchlibdir" >&6; }
 
@@ -8544,7 +8544,7 @@
 ## This path includes the Octave version and configuration name, so that
 ## configurations for multiple versions of Octave may be installed at once.
 
-  : ${octfiledir='${libdir}/octave/${version}/oct/${canonical_host_type}'}
+  : ${octfiledir='${libdir}/octave/${version}/oct/__MACPORTS_canonical_host_type__'}
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining octfiledir to be $octfiledir" >&5
 printf "%s\n" "defining octfiledir to be $octfiledir" >&6; }
 
@@ -8555,21 +8555,21 @@
 ## before consulting ${octfiledir}.  This should be a colon-separated list of
 ## directories.
 
-  : ${localoctfiledir='${libdir}/octave/site/oct/${canonical_host_type}'}
+  : ${localoctfiledir='${libdir}/octave/site/oct/__MACPORTS_canonical_host_type__'}
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining localoctfiledir to be $localoctfiledir" >&5
 printf "%s\n" "defining localoctfiledir to be $localoctfiledir" >&6; }
 
 
 
 
-  : ${localapioctfiledir='${libdir}/octave/site/oct/${api_version}/${canonical_host_type}'}
+  : ${localapioctfiledir='${libdir}/octave/site/oct/${api_version}/__MACPORTS_canonical_host_type__'}
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining localapioctfiledir to be $localapioctfiledir" >&5
 printf "%s\n" "defining localapioctfiledir to be $localapioctfiledir" >&6; }
 
 
 
 
-  : ${localveroctfiledir='${libdir}/octave/${version}/site/oct/${canonical_host_type}'}
+  : ${localveroctfiledir='${libdir}/octave/${version}/site/oct/__MACPORTS_canonical_host_type__'}
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining localveroctfiledir to be $localveroctfiledir" >&5
 printf "%s\n" "defining localveroctfiledir to be $localveroctfiledir" >&6; }