Mercurial > mxe-octave

changeset 4097:62e60aa89275

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-windows: update to v1.2.3 * src/of-windows.mk: update version, checksum * src/of-windows-1-fixes.patch: removed * dist-files.mk: removed src/of-windows-1-fixes.patch * build_packages.m: update windows version
author John Donoghue
date Thu, 25 Feb 2016 07:40:44 -0500
parents 414c464563c6
children 0727a16b2124
files build_packages.m dist-files.mk src/of-windows-1-fixes.patch src/of-windows.mk
diffstat 4 files changed, 4 insertions(+), 654 deletions(-) [+]
line wrap: on
line diff
--- a/build_packages.m	Thu Feb 25 13:14:54 2016 -0500
+++ b/build_packages.m	Thu Feb 25 07:40:44 2016 -0500
@@ -32,7 +32,7 @@
 try_install io-2.2.11.tar.gz
 try_install statistics-1.2.4.tar.gz
 try_install geometry-2.1.0.tar.gz
-try_install windows-1.2.1.tar.gz
+try_install windows-1.2.3.tar.gz
 try_install odepkg-0.8.5.tar.gz
 try_install linear-algebra-2.2.2.tar.gz
 try_install sockets-1.2.0.tar.gz
--- a/dist-files.mk	Thu Feb 25 13:14:54 2016 -0500
+++ b/dist-files.mk	Thu Feb 25 07:40:44 2016 -0500
@@ -509,7 +509,6 @@
   of-tsa-1-cross-fixes.patch \
   of-tsa.mk \
   of-video.mk \
-  of-windows-1-fixes.patch \
   of-windows.mk \
   of-zenity.mk \
   ogg.mk \
--- a/src/of-windows-1-fixes.patch	Thu Feb 25 13:14:54 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,649 +0,0 @@
-diff -ur Windows.orig/src/__COM__.cc Windows/src/__COM__.cc
---- Windows.orig/src/__COM__.cc	2015-04-15 19:22:06.000000000 -0400
-+++ Windows/src/__COM__.cc	2015-04-15 19:22:30.000000000 -0400
-@@ -157,15 +157,23 @@
- 
- 	dim_vector dims(void) const { static dim_vector dv(1, 1); return dv; }
- 
--	void print(std::ostream& os, bool pr_as_read_syntax = false) const
-+	void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const
- 	{
--		os << "<COM object " << (com_typename.empty() ? std::string("Unknown") : com_typename) << " (0x" << (void*)iface << ")>";
--		newline(os);
-+		os << "<COM object " 
-+                   << (com_typename.empty () ? std::string("Unknown") : com_typename) 
-+                   << " (0x" << (void*)iface << ")>";
-+	}
-+
-+	void print (std::ostream& os, bool pr_as_read_syntax = false)
-+	{
-+                print_raw (os, pr_as_read_syntax);
-+		newline (os);
- 	}
- 	
--	void print_raw(std::ostream& os, bool pr_as_read_syntax = false) const
-+	void print (std::ostream& os, bool pr_as_read_syntax = false) const
- 	{
--		print(os, pr_as_read_syntax);
-+                print_raw (os, pr_as_read_syntax);
-+		newline (os);
- 	}
- 
- 	octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout);
-@@ -180,7 +188,9 @@
- 
- private:
- 	// regular octave value declarations
-+  #if defined (DEFINE_OCTAVE_ALLOCATOR)	
- 	DECLARE_OCTAVE_ALLOCATOR
-+  #endif
- 	
- 	DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
- 
-@@ -189,7 +199,9 @@
- 	std::string com_typename;
- };
- 
-+#if defined (DEFINE_OCTAVE_ALLOCATOR)
- DEFINE_OCTAVE_ALLOCATOR (octave_com_object);
-+#endif
- 
- DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_com_object,
- 		"octave_com_object",
-diff -ur Windows.orig/src/configure Windows/src/configure
---- Windows.orig/src/configure	2015-04-15 19:22:06.000000000 -0400
-+++ Windows/src/configure	2015-04-15 19:22:19.000000000 -0400
-@@ -1,11 +1,9 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.68.
-+# Generated by GNU Autoconf 2.69.
- #
- #
--# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
--# Foundation, Inc.
-+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
- #
- #
- # This configure script is free software; the Free Software Foundation
-@@ -134,6 +132,31 @@
- # CDPATH.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
-+# Use a proper internal environment variable to ensure we don't fall
-+  # into an infinite loop, continuously re-executing ourselves.
-+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-+    _as_can_reexec=no; export _as_can_reexec;
-+    # We cannot yet assume a decent shell, so we have to provide a
-+# neutralization value for shells without unset; and this also
-+# works around shells that cannot unset nonexistent variables.
-+# Preserve -v and -x to the replacement shell.
-+BASH_ENV=/dev/null
-+ENV=/dev/null
-+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-+case $- in # ((((
-+  *v*x* | *x*v* ) as_opts=-vx ;;
-+  *v* ) as_opts=-v ;;
-+  *x* ) as_opts=-x ;;
-+  * ) as_opts= ;;
-+esac
-+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-+# Admittedly, this is quite paranoid, since all the known shells bail
-+# out after a failed `exec'.
-+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-+as_fn_exit 255
-+  fi
-+  # We don't want this to propagate to other subprocesses.
-+          { _as_can_reexec=; unset _as_can_reexec;}
- if test "x$CONFIG_SHELL" = x; then
-   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-   emulate sh
-@@ -167,7 +190,8 @@
- else
-   exitcode=1; echo positional parameters were not saved.
- fi
--test x\$exitcode = x0 || exit 1"
-+test x\$exitcode = x0 || exit 1
-+test -x / || exit 1"
-   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-@@ -211,21 +235,25 @@
- 
- 
-       if test "x$CONFIG_SHELL" != x; then :
--  # We cannot yet assume a decent shell, so we have to provide a
--	# neutralization value for shells without unset; and this also
--	# works around shells that cannot unset nonexistent variables.
--	# Preserve -v and -x to the replacement shell.
--	BASH_ENV=/dev/null
--	ENV=/dev/null
--	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
--	export CONFIG_SHELL
--	case $- in # ((((
--	  *v*x* | *x*v* ) as_opts=-vx ;;
--	  *v* ) as_opts=-v ;;
--	  *x* ) as_opts=-x ;;
--	  * ) as_opts= ;;
--	esac
--	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-+  export CONFIG_SHELL
-+             # We cannot yet assume a decent shell, so we have to provide a
-+# neutralization value for shells without unset; and this also
-+# works around shells that cannot unset nonexistent variables.
-+# Preserve -v and -x to the replacement shell.
-+BASH_ENV=/dev/null
-+ENV=/dev/null
-+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-+case $- in # ((((
-+  *v*x* | *x*v* ) as_opts=-vx ;;
-+  *v* ) as_opts=-v ;;
-+  *x* ) as_opts=-x ;;
-+  * ) as_opts= ;;
-+esac
-+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-+# Admittedly, this is quite paranoid, since all the known shells bail
-+# out after a failed `exec'.
-+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-+exit 255
- fi
- 
-     if test x$as_have_required = xno; then :
-@@ -327,6 +355,14 @@
- 
- 
- } # as_fn_mkdir_p
-+
-+# as_fn_executable_p FILE
-+# -----------------------
-+# Test if FILE is an executable regular file.
-+as_fn_executable_p ()
-+{
-+  test -f "$1" && test -x "$1"
-+} # as_fn_executable_p
- # as_fn_append VAR VALUE
- # ----------------------
- # Append the text in VALUE to the end of the definition contained in VAR. Take
-@@ -448,6 +484,10 @@
-   chmod +x "$as_me.lineno" ||
-     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
- 
-+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-+  # already done that, so ensure we don't try to do so again and fall
-+  # in an infinite loop.  This has already happened in practice.
-+  _as_can_reexec=no; export _as_can_reexec
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-   # original and so on.  Autoconf is especially sensitive to this).
-@@ -482,16 +522,16 @@
-     # ... but there are two gotchas:
-     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--    # In both cases, we have to default to `cp -p'.
-+    # In both cases, we have to default to `cp -pR'.
-     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
--      as_ln_s='cp -p'
-+      as_ln_s='cp -pR'
-   elif ln conf$$.file conf$$ 2>/dev/null; then
-     as_ln_s=ln
-   else
--    as_ln_s='cp -p'
-+    as_ln_s='cp -pR'
-   fi
- else
--  as_ln_s='cp -p'
-+  as_ln_s='cp -pR'
- fi
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
-@@ -503,28 +543,8 @@
-   as_mkdir_p=false
- fi
- 
--if test -x / >/dev/null 2>&1; then
--  as_test_x='test -x'
--else
--  if ls -dL / >/dev/null 2>&1; then
--    as_ls_L_option=L
--  else
--    as_ls_L_option=
--  fi
--  as_test_x='
--    eval sh -c '\''
--      if test -d "$1"; then
--	test -d "$1/.";
--      else
--	case $1 in #(
--	-*)set "./$1";;
--	esac;
--	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
--	???[sx]*):;;*)false;;esac;fi
--    '\'' sh
--  '
--fi
--as_executable_p=$as_test_x
-+as_test_x='test -x'
-+as_executable_p=as_fn_executable_p
- 
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -587,6 +607,7 @@
- mpath
- subver
- ver
-+OCTAVE_CONFIG
- MKOCTFILE
- OBJEXT
- EXEEXT
-@@ -1110,8 +1131,6 @@
- if test "x$host_alias" != x; then
-   if test "x$build_alias" = x; then
-     cross_compiling=maybe
--    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
--    If a cross compiler is detected then cross compile mode will be used" >&2
-   elif test "x$build_alias" != "x$host_alias"; then
-     cross_compiling=yes
-   fi
-@@ -1347,9 +1366,9 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- configure
--generated by GNU Autoconf 2.68
-+generated by GNU Autoconf 2.69
- 
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2012 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1402,7 +1421,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.68.  Invocation command line was
-+generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -1787,7 +1806,7 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -1827,7 +1846,7 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_CC="gcc"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -1880,7 +1899,7 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_CC="${ac_tool_prefix}cc"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -1921,7 +1940,7 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-        continue
-@@ -1979,7 +1998,7 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2023,7 +2042,7 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_CC="$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2469,8 +2488,7 @@
- /* end confdefs.h.  */
- #include <stdarg.h>
- #include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
-+struct stat;
- /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
- struct buf { int x; };
- FILE * (*rcsopen) (struct buf *, struct stat *, int);
-@@ -2575,7 +2593,7 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_MKOCTFILE="mkoctfile"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2598,6 +2616,45 @@
- 
- test -z "$MKOCTFILE" &&	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no mkoctfile found on path" >&5
- $as_echo "$as_me: WARNING: no mkoctfile found on path" >&2;}
-+# Extract the first word of "octave-config", so it can be a program name with args.
-+set dummy octave-config; 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_OCTAVE_CONFIG+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$OCTAVE_CONFIG"; then
-+  ac_cv_prog_OCTAVE_CONFIG="$OCTAVE_CONFIG" # 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_OCTAVE_CONFIG="octave-config"
-+    $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
-+OCTAVE_CONFIG=$ac_cv_prog_OCTAVE_CONFIG
-+if test -n "$OCTAVE_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_CONFIG" >&5
-+$as_echo "$OCTAVE_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+test -z "$OCTAVE_CONFIG" &&	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no octave-config found on path" >&5
-+$as_echo "$as_me: WARNING: no octave-config found on path" >&2;}
- 
- 
- 
-@@ -2777,6 +2834,8 @@
- 
- 
- 
-+
-+
- # Extract the first word of "octave", so it can be a program name with args.
- set dummy octave; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-@@ -2793,7 +2852,7 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_OCTAVE="octave"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2814,25 +2873,25 @@
- fi
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCTAVE_VERSION in Octave" >&5
--$as_echo_n "checking for OCTAVE_VERSION in Octave... " >&6; }
--OCTAVE_VERSION=`echo "disp(OCTAVE_VERSION)" | $OCTAVE -qf`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VERSION in octave-config" >&5
-+$as_echo_n "checking for VERSION in octave-config... " >&6; }
-+OCTAVE_VERSION=`$OCTAVE_CONFIG -p VERSION`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_VERSION" >&5
- $as_echo "$OCTAVE_VERSION" >&6; }
- 
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_config_info('canonical_host_type') in Octave" >&5
--$as_echo_n "checking for octave_config_info('canonical_host_type') in Octave... " >&6; }
--canonical_host_type=`echo "disp(octave_config_info('canonical_host_type'))" | $OCTAVE -qf`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANONICAL_HOST_TYPE in octave-config" >&5
-+$as_echo_n "checking for CANONICAL_HOST_TYPE in octave-config... " >&6; }
-+canonical_host_type=`$OCTAVE_CONFIG -p CANONICAL_HOST_TYPE`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $canonical_host_type" >&5
- $as_echo "$canonical_host_type" >&6; }
- 
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_config_info('SHLEXT') in Octave" >&5
--$as_echo_n "checking for octave_config_info('SHLEXT') in Octave... " >&6; }
--SHLEXT=`echo "disp(octave_config_info('SHLEXT'))" | $OCTAVE -qf`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHLEXT in octave-config" >&5
-+$as_echo_n "checking for SHLEXT in octave-config... " >&6; }
-+SHLEXT=`$OCTAVE_CONFIG -p SHLEXT`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHLEXT" >&5
- $as_echo "$SHLEXT" >&6; }
- 
-@@ -2867,7 +2926,7 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2907,7 +2966,7 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_RANLIB="ranlib"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2968,7 +3027,7 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_STRIP="$STRIP"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -3020,7 +3079,8 @@
- 
- octave-forge is configured with
-    octave:      $OCTAVE (version $OCTAVE_VERSION)
--   mkoctfile:	$MKOCTFILE for Octave $subver"
-+   mkoctfile:	$MKOCTFILE for Octave $OCTAVE_VERSION
-+   octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION"
-   ac_config_files="$ac_config_files $CONFIGURE_OUTPUTS"
- 
- 
-@@ -3382,16 +3442,16 @@
-     # ... but there are two gotchas:
-     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--    # In both cases, we have to default to `cp -p'.
-+    # In both cases, we have to default to `cp -pR'.
-     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
--      as_ln_s='cp -p'
-+      as_ln_s='cp -pR'
-   elif ln conf$$.file conf$$ 2>/dev/null; then
-     as_ln_s=ln
-   else
--    as_ln_s='cp -p'
-+    as_ln_s='cp -pR'
-   fi
- else
--  as_ln_s='cp -p'
-+  as_ln_s='cp -pR'
- fi
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
-@@ -3451,28 +3511,16 @@
-   as_mkdir_p=false
- fi
- 
--if test -x / >/dev/null 2>&1; then
--  as_test_x='test -x'
--else
--  if ls -dL / >/dev/null 2>&1; then
--    as_ls_L_option=L
--  else
--    as_ls_L_option=
--  fi
--  as_test_x='
--    eval sh -c '\''
--      if test -d "$1"; then
--	test -d "$1/.";
--      else
--	case $1 in #(
--	-*)set "./$1";;
--	esac;
--	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
--	???[sx]*):;;*)false;;esac;fi
--    '\'' sh
--  '
--fi
--as_executable_p=$as_test_x
-+
-+# as_fn_executable_p FILE
-+# -----------------------
-+# Test if FILE is an executable regular file.
-+as_fn_executable_p ()
-+{
-+  test -f "$1" && test -x "$1"
-+} # as_fn_executable_p
-+as_test_x='test -x'
-+as_executable_p=as_fn_executable_p
- 
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -3494,7 +3542,7 @@
- # values after options handling.
- ac_log="
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.68.  Invocation command line was
-+generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -3547,10 +3595,10 @@
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.68,
-+configured by $0, generated by GNU Autoconf 2.69,
-   with options \\"\$ac_cs_config\\"
- 
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2012 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- 
-@@ -3627,7 +3675,7 @@
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- if \$ac_cs_recheck; then
--  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-   shift
-   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-   CONFIG_SHELL='$SHELL'
-diff -ur Windows.orig/src/configure.base Windows/src/configure.base
---- Windows.orig/src/configure.base	2015-04-15 19:22:06.000000000 -0400
-+++ Windows/src/configure.base	2015-04-15 19:22:19.000000000 -0400
-@@ -49,6 +49,8 @@
- dnl Check for mkoctfile
- AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile)
- test -z "$MKOCTFILE" &&	AC_MSG_WARN([no mkoctfile found on path])
-+AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config)
-+test -z "$OCTAVE_CONFIG" &&	AC_MSG_WARN([no octave-config found on path])
- 
- AC_SUBST(ver)
- AC_SUBST(subver)
-@@ -257,15 +259,22 @@
- fi
- ])
- 
-+AC_DEFUN(OCTAVE_CONFIG_EVAL,
-+[AC_MSG_CHECKING([for $1 in octave-config])
-+$2=`$OCTAVE_CONFIG -p $1`
-+AC_MSG_RESULT($$2)
-+AC_SUBST($2)
-+])
-+
- dnl should check that $(OCTAVE) --version matches $(MKOCTFILE) --version
- AC_CHECK_PROG(OCTAVE,octave,octave)
--OCTAVE_EVAL(OCTAVE_VERSION,OCTAVE_VERSION)
-+OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION)
- 
- dnl grab canonical host type so we can write system specific install stuff
--OCTAVE_EVAL(octave_config_info('canonical_host_type'),canonical_host_type)
-+OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type)
- 
- dnl grab SHLEXT from octave config
--OCTAVE_EVAL(octave_config_info('SHLEXT'),SHLEXT)
-+OCTAVE_CONFIG_EVAL(SHLEXT,SHLEXT)
- 
- AC_PROG_LN_S
- 
-@@ -351,4 +360,5 @@
- 
- octave-forge is configured with
-    octave:      $OCTAVE (version $OCTAVE_VERSION)
--   mkoctfile:	$MKOCTFILE for Octave $subver"
-+   mkoctfile:	$MKOCTFILE for Octave $OCTAVE_VERSION
-+   octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION"
-diff -ur Windows.orig/src/grab.cc Windows/src/grab.cc
---- Windows.orig/src/grab.cc	2015-04-15 19:22:06.000000000 -0400
-+++ Windows/src/grab.cc	2015-04-15 19:22:19.000000000 -0400
-@@ -123,8 +123,8 @@
- 
- 
-   /* Wait for a click */
--  MArray<int> xc(maxpoints);
--  MArray<int> yc(maxpoints);
-+  MArray<int> xc(dim_vector(maxpoints,1));
-+  MArray<int> yc(dim_vector(maxpoints,1));
- 
-   int nb_elements = 0;
-   while (1) {
-@@ -142,8 +142,8 @@
-     else break;
-     
-     if (nb_elements == xc.length()) {
--      xc.resize (xc.length()+maxpoints);
--      yc.resize (yc.length()+maxpoints);
-+      xc.resize (dim_vector(xc.length()+maxpoints,1));
-+      yc.resize (dim_vector(yc.length()+maxpoints,1));
-     }
-   }
- 
-diff -ur Windows.orig/src/Makeconf.in Windows/src/Makeconf.in
---- Windows.orig/src/Makeconf.in	2015-04-15 19:22:06.000000000 -0400
-+++ Windows/src/Makeconf.in	2015-04-15 19:22:19.000000000 -0400
-@@ -52,6 +52,7 @@
- OCTAVE = @OCTAVE@
- OCTAVE_VERSION = @OCTAVE_VERSION@
- MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
-+OCTAVE_CONFIG = @OCTAVE_CONFIG@
- SHLEXT = @SHLEXT@
- 
- ver = @ver@
--- a/src/of-windows.mk	Thu Feb 25 13:14:54 2016 -0500
+++ b/src/of-windows.mk	Thu Feb 25 07:40:44 2016 -0500
@@ -3,10 +3,10 @@
 
 PKG             := of-windows
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.1
-$(PKG)_CHECKSUM := 2270f3d64cf69d030e6825303158c18b9b94a871
+$(PKG)_VERSION  := 1.2.3
+$(PKG)_CHECKSUM := b057ad6de503ea23a3764d1216fc4d93436ccd91
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := Windows
+$(PKG)_SUBDIR   := windows
 $(PKG)_FILE     := windows-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
 $(PKG)_DEPS     :=