# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1360622181 18000
# Node ID eb750a42bf464a9e371c0d82821a2ac02e91438e
# Parent  a6cdc75d044be9074a58d443cc3a717da68e6c68
update to 3.6.4-rc2 for the stable-octave package

diff -r a6cdc75d044b -r eb750a42bf46 index.html
--- a/index.html	Sun Feb 10 12:23:40 2013 -0500
+++ b/index.html	Mon Feb 11 17:36:21 2013 -0500
@@ -1870,7 +1870,7 @@
     </tr>
     <tr>
         <td id="stable-octave-package">stable-octave</td>
-        <td id="stable-octave-version">3.6.4-rc1</td>
+        <td id="stable-octave-version">3.6.4-rc2</td>
         <td id="stable-octave-website"><a href="http://octave.org/">Octave</a></td>
     </tr>
     <tr>
diff -r a6cdc75d044b -r eb750a42bf46 src/stable-octave-1-fixes.patch
--- a/src/stable-octave-1-fixes.patch	Sun Feb 10 12:23:40 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
---- a/libgnu/unistd.in.h	2012-12-03 12:57:36.000000000 -0500
-+++ b/libgnu/unistd.in.h	2012-12-03 14:22:38.421760035 -0500
-@@ -19,23 +19,7 @@
- #endif
- @PRAGMA_COLUMNS@
- 
--/* Special invocation convention:
--   - On mingw, several headers, including <winsock2.h>, include <unistd.h>,
--     but we need to ensure that both the system <unistd.h> and <winsock2.h>
--     are completely included before we replace gethostname.  */
--#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
--  && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
--/* <unistd.h> is being indirectly included for the first time from
--   <winsock2.h>; avoid declaring any overrides.  */
--# if @HAVE_UNISTD_H@
--#  @INCLUDE_NEXT@ @NEXT_UNISTD_H@
--# else
--#  error unexpected; report this to bug-gnulib@gnu.org
--# endif
--# define _GL_WINSOCK2_H_WITNESS
--
--/* Normal invocation.  */
--#elif !defined _@GUARD_PREFIX@_UNISTD_H
-+#if !defined _@GUARD_PREFIX@_UNISTD_H
- 
- /* The include_next requires a split double-inclusion guard.  */
- #if @HAVE_UNISTD_H@
diff -r a6cdc75d044b -r eb750a42bf46 src/stable-octave-2-fixes.patch
--- a/src/stable-octave-2-fixes.patch	Sun Feb 10 12:23:40 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-diff --git a/build-aux/common.mk b/build-aux/common.mk
---- a/build-aux/common.mk
-+++ b/build-aux/common.mk
-@@ -1,3 +1,5 @@
-+CROSS_TOOL_PREFIX = @CROSS_TOOL_PREFIX@
-+
- AWK = @AWK@
- export AWK
- 
-@@ -164,6 +166,15 @@
- 
- FLIBS = @FLIBS@
- 
-+MKOCTFILE_CC = @MKOCTFILE_CC@
-+MKOCTFILE_CXX = @MKOCTFILE_CXX@
-+MKOCTFILE_DL_LD = @MKOCTFILE_DL_LD@
-+MKOCTFILE_DL_LDFLAGS = @MKOCTFILE_DL_LDFLAGS@
-+MKOCTFILE_F77 = @MKOCTFILE_F77@
-+MKOCTFILE_LD_CXX = @MKOCTFILE_LD_CXX@
-+
-+# List of libraries and their special compilation flags
-+
- LIBOCTINTERP = @LIBOCTINTERP@
- LIBOCTAVE = @LIBOCTAVE@
- LIBCRUFT = @LIBCRUFT@
-@@ -539,7 +550,12 @@
-   -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \
-   -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \
-   -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \
--  -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"@MKOCTFILE_DL_LDFLAGS@\"|' \
-+  -e 's|%OCTAVE_CONF_MKOCTFILE_CC%|\"${MKOCTFILE_CC}\"|' \
-+  -e 's|%OCTAVE_CONF_MKOCTFILE_CXX%|\"${MKOCTFILE_CXX}\"|' \
-+  -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"${MKOCTFILE_DL_LD}\"|' \
-+  -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${MKOCTFILE_DL_LDFLAGS}\"|' \
-+  -e 's|%OCTAVE_CONF_MKOCTFILE_F77%|\"${MKOCTFILE_F77}\"|' \
-+  -e 's|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${MKOCTFILE_LD_CXX}\"|' \
-   -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \
-   -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \
-   -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -1792,6 +1792,35 @@
- OCTAVE_CMATH_FUNC(isinf)
- OCTAVE_CMATH_FUNC(isfinite)
- 
-+if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then
-+  CROSS_TOOL_PREFIX="$ac_tool_prefix"
-+  MKOCTFILE_CC='$(shell echo $(CC) | sed "s,$(CROSS_TOOL_PREFIX),,")'
-+  MKOCTFILE_CXX='$(shell echo $(CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")'
-+  MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | sed "s,$(CROSS_TOOL_PREFIX),,")'
-+  MKOCTFILE_F77='$(shell echo $(F77) | sed "s,$(CROSS_TOOL_PREFIX),,")'
-+  MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")'
-+else
-+  MKOCTFILE_CC="$CC"
-+  MKOCTFILE_CXX="$CXX"
-+  MKOCTFILE_DL_LD="$DL_LD"
-+  MKOCTFILE_F77="$F77"
-+  MKOCTFILE_LD_CXX="$LD_CXX"
-+fi
-+AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX])
-+AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC])
-+AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX])
-+AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD])
-+AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77])
-+AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX])
-+AC_SUBST(CROSS_TOOL_PREFIX)
-+AC_SUBST(MKOCTFILE_CC)
-+AC_SUBST(MKOCTFILE_CXX)
-+AC_SUBST(MKOCTFILE_DL_LD)
-+AC_SUBST(MKOCTFILE_F77)
-+AC_SUBST(MKOCTFILE_LD_CXX)
-+
-+### Check for existence of various libraries
-+
- dnl Would like to get rid of this cruft, and just have
- dnl
- dnl   AC_CHECK_FUNCS(finite isnan isinf)
-diff --git a/src/mkoctfile.cc.in b/src/mkoctfile.cc.in
---- a/src/mkoctfile.cc.in
-+++ b/src/mkoctfile.cc.in
-@@ -201,13 +201,13 @@
- 
-   vars["CPPFLAGS"] = get_variable ("CPPFLAGS", %OCTAVE_CONF_CPPFLAGS%);
-   vars["INCFLAGS"] = get_variable ("INCFLAGS", DEFAULT_INCFLAGS);
--  vars["F77"] = get_variable ("F77", %OCTAVE_CONF_F77%);
-+  vars["F77"] = get_variable ("F77", %OCTAVE_CONF_MKOCTFILE_F77%);
-   vars["FFLAGS"] = get_variable ("FFLAGS", %OCTAVE_CONF_FFLAGS%);
-   vars["FPICFLAG"] = get_variable ("FPICFLAG", %OCTAVE_CONF_FPICFLAG%);
--  vars["CC"] = get_variable ("CC", %OCTAVE_CONF_CC%);
-+  vars["CC"] = get_variable ("CC", %OCTAVE_CONF_MKOCTFILE_CC%);
-   vars["CFLAGS"] = get_variable ("CFLAGS", %OCTAVE_CONF_CFLAGS%);
-   vars["CPICFLAG"] = get_variable ("CPICFLAG", %OCTAVE_CONF_CPICFLAG%);
--  vars["CXX"] = get_variable ("CXX", %OCTAVE_CONF_CXX%);
-+  vars["CXX"] = get_variable ("CXX", %OCTAVE_CONF_MKOCTFILE_CXX%);
-   vars["CXXFLAGS"] = get_variable ("CXXFLAGS", %OCTAVE_CONF_CXXFLAGS%);
-   vars["CXXPICFLAG"] = get_variable ("CXXPICFLAG", %OCTAVE_CONF_CXXPICFLAG%);
-   vars["XTRA_CFLAGS"] = get_variable ("XTRA_CFLAGS", %OCTAVE_CONF_XTRA_CFLAGS%);
-@@ -216,7 +216,7 @@
-   vars["DEPEND_FLAGS"] = get_variable ("DEPEND_FLAGS", %OCTAVE_CONF_DEPEND_FLAGS%);
-   vars["DEPEND_EXTRA_SED_PATTERN"] = get_variable ("DEPEND_EXTRA_SED_PATTERN", %OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%);
- 
--  vars["DL_LD"] = get_variable ("DL_LD", %OCTAVE_CONF_DL_LD%);
-+  vars["DL_LD"] = get_variable ("DL_LD", %OCTAVE_CONF_MKOCTFILE_DL_LD%);
-   vars["DL_LDFLAGS"] = get_variable ("DL_LDFLAGS", %OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%);
- 
-   vars["RDYNAMIC_FLAG"] = get_variable ("RDYNAMIC_FLAG", %OCTAVE_CONF_RDYNAMIC_FLAG%);
-@@ -236,7 +236,7 @@
-   vars["OCT_LINK_DEPS"] = get_variable ("FLIBS", %OCTAVE_CONF_OCT_LINK_DEPS%);
-   vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%);
- 
--  vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_LD_CXX%);
-+  vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_MKOCTFILE_LD_CXX%);
-   vars["LDFLAGS"] = get_variable ("LDFLAGS", %OCTAVE_CONF_LDFLAGS%);
-   vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG", %OCTAVE_CONF_LD_STATIC_FLAG%);
-   vars["LFLAGS"] = get_variable ("LFLAGS", DEFAULT_LFLAGS);
-diff --git a/src/mkoctfile.in b/src/mkoctfile.in
---- a/src/mkoctfile.in
-+++ b/src/mkoctfile.in
-@@ -67,13 +67,13 @@
- 
- : ${CPPFLAGS=%OCTAVE_CONF_CPPFLAGS%}
- : ${INCFLAGS=$DEFAULT_INCFLAGS}
--: ${F77=%OCTAVE_CONF_F77%}
-+: ${F77=%OCTAVE_CONF_MKOCTFILE_F77%}
- : ${FFLAGS=%OCTAVE_CONF_FFLAGS%}
- : ${FPICFLAG=%OCTAVE_CONF_FPICFLAG%}
--: ${CC=%OCTAVE_CONF_CC%}
-+: ${CC=%OCTAVE_CONF_MKOCTFILE_CC%}
- : ${CFLAGS=%OCTAVE_CONF_CFLAGS%}
- : ${CPICFLAG=%OCTAVE_CONF_CPICFLAG%}
--: ${CXX=%OCTAVE_CONF_CXX%}
-+: ${CXX=%OCTAVE_CONF_MKOCTFILE_CXX%}
- : ${CXXFLAGS=%OCTAVE_CONF_CXXFLAGS%}
- : ${CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%}
- : ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%}
-@@ -82,7 +82,7 @@
- : ${DEPEND_FLAGS=%OCTAVE_CONF_DEPEND_FLAGS%}
- : ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%}
- 
--: ${DL_LD=%OCTAVE_CONF_DL_LD%}
-+: ${DL_LD=%OCTAVE_CONF_MKOCTFILE_DL_LD%}
- : ${DL_LDFLAGS=%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%}
- 
- : ${RDYNAMIC_FLAG=%OCTAVE_CONF_RDYNAMIC_FLAG%}
-@@ -102,7 +102,7 @@
- : ${OCTAVE_LINK_OPTS=%OCTAVE_CONF_OCTAVE_LINK_OPTS%}
- : ${OCT_LINK_DEPS=%OCTAVE_CONF_OCT_LINK_DEPS%}
- : ${OCT_LINK_OPTS=%OCTAVE_CONF_OCT_LINK_OPTS%}
--: ${LD_CXX=%OCTAVE_CONF_LD_CXX%}
-+: ${LD_CXX=%OCTAVE_CONF_MKOCTFILE_LD_CXX%}
- : ${LDFLAGS=%OCTAVE_CONF_LDFLAGS%}
- : ${LD_STATIC_FLAG=%OCTAVE_CONF_LD_STATIC_FLAG%}
- : ${LFLAGS=$DEFAULT_LFLAGS}
diff -r a6cdc75d044b -r eb750a42bf46 src/stable-octave-3-fixes.patch
--- a/src/stable-octave-3-fixes.patch	Sun Feb 10 12:23:40 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff --git a/liboctave/lo-cutils.h b/liboctave/lo-cutils.h
---- a/liboctave/lo-cutils.h
-+++ b/liboctave/lo-cutils.h
-@@ -23,6 +23,8 @@
- #if !defined (octave_liboctave_cutils_h)
- #define octave_liboctave_cutils_h 1
- 
-+#include "sys/types.h"
-+
- #ifdef HAVE_LOADLIBRARY_API
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
diff -r a6cdc75d044b -r eb750a42bf46 src/stable-octave-4-fixes.patch
--- a/src/stable-octave-4-fixes.patch	Sun Feb 10 12:23:40 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,251 +0,0 @@
-# HG changeset patch
-# User John W. Eaton <jwe@octave.org>
-# Date 1358194024 18000
-# Branch stable
-# Node ID a653526ea4a5522485b8253dc818588de708b17d
-# Parent  398ae067e811103509429aa6f3d998b2494fce1b
-use mkoctfile, not octave_config_info to get default pkg compiler tools
-
-* common.mk (MKOCTFILE_AR, MKOCTFILE_RANLIB): New variables.
-(do_subst_config_vals): Include MKOCTFILE_AR and MKOCTFILE_RANLIB in
-the list of substitutions.
-* configure.ac (MKOCTFILE_AR, MKOCTFILE_RANLIB): Additional mkoctfile
-values that receive special treatment when cross compiling.
-* pkg/pkg.m (configure_make): Use mkoctfile, not octave_config_info
-to get values for CC, CXX, AR, and RANLIB.
-* mkoctfile.cc.in, mkoctfile.in (AR, RANLIB): New variables.
-Update usage message.
-
-diff --git a/build-aux/common.mk b/build-aux/common.mk
---- a/build-aux/common.mk
-+++ b/build-aux/common.mk
-@@ -166,12 +166,14 @@
- 
- FLIBS = @FLIBS@
- 
-+MKOCTFILE_AR = @MKOCTFILE_AR@
- MKOCTFILE_CC = @MKOCTFILE_CC@
- MKOCTFILE_CXX = @MKOCTFILE_CXX@
- MKOCTFILE_DL_LD = @MKOCTFILE_DL_LD@
- MKOCTFILE_DL_LDFLAGS = @MKOCTFILE_DL_LDFLAGS@
- MKOCTFILE_F77 = @MKOCTFILE_F77@
- MKOCTFILE_LD_CXX = @MKOCTFILE_LD_CXX@
-+MKOCTFILE_RANLIB = @MKOCTFILE_RANLIB@
- 
- # List of libraries and their special compilation flags
- 
-@@ -550,12 +552,14 @@
-   -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \
-   -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \
-   -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \
-+  -e 's|%OCTAVE_CONF_MKOCTFILE_AR%|\"${MKOCTFILE_AR}\"|' \
-   -e 's|%OCTAVE_CONF_MKOCTFILE_CC%|\"${MKOCTFILE_CC}\"|' \
-   -e 's|%OCTAVE_CONF_MKOCTFILE_CXX%|\"${MKOCTFILE_CXX}\"|' \
-   -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"${MKOCTFILE_DL_LD}\"|' \
-   -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${MKOCTFILE_DL_LDFLAGS}\"|' \
-   -e 's|%OCTAVE_CONF_MKOCTFILE_F77%|\"${MKOCTFILE_F77}\"|' \
-   -e 's|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${MKOCTFILE_LD_CXX}\"|' \
-+  -e 's|%OCTAVE_CONF_MKOCTFILE_RANLIB%|\"${MKOCTFILE_RANLIB}\"|' \
-   -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \
-   -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \
-   -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -1794,30 +1794,38 @@
- 
- if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then
-   CROSS_TOOL_PREFIX="$ac_tool_prefix"
-+  MKOCTFILE_AR='$(shell echo $(AR) | sed "s,$(CROSS_TOOL_PREFIX),,")'
-   MKOCTFILE_CC='$(shell echo $(CC) | sed "s,$(CROSS_TOOL_PREFIX),,")'
-   MKOCTFILE_CXX='$(shell echo $(CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")'
-   MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | sed "s,$(CROSS_TOOL_PREFIX),,")'
-   MKOCTFILE_F77='$(shell echo $(F77) | sed "s,$(CROSS_TOOL_PREFIX),,")'
-   MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")'
-+  MKOCTFILE_RANLIB='$(shell 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"
- fi
- AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX])
-+AC_MSG_NOTICE([defining MKOCTFILE_AR to be $MKOCTFILE_AR])
- AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC])
- AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX])
- AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD])
- AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77])
- AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX])
-+AC_MSG_NOTICE([defining MKOCTFILE_RANLIB to be $MKOCTFILE_RANLIB])
- AC_SUBST(CROSS_TOOL_PREFIX)
-+AC_SUBST(MKOCTFILE_AR)
- AC_SUBST(MKOCTFILE_CC)
- AC_SUBST(MKOCTFILE_CXX)
- AC_SUBST(MKOCTFILE_DL_LD)
- AC_SUBST(MKOCTFILE_F77)
- AC_SUBST(MKOCTFILE_LD_CXX)
-+AC_SUBST(MKOCTFILE_RANLIB)
- 
- ### Check for existence of various libraries
- 
-diff --git a/scripts/pkg/pkg.m b/scripts/pkg/pkg.m
---- a/scripts/pkg/pkg.m
-+++ b/scripts/pkg/pkg.m
-@@ -1342,11 +1342,11 @@
-     src = fullfile (packdir, "src");
-     octave_bindir = octave_config_info ("bindir");
-     ver = version ();
--    mkoctfile = fullfile (octave_bindir, sprintf ("mkoctfile-%s", ver));
--    octave_config = fullfile (octave_bindir, sprintf ("octave-config-%s", ver));
-+    mkoctfile_program = fullfile (octave_bindir, sprintf ("mkoctfile-%s", ver));
-+    octave_config_program = fullfile (octave_bindir, sprintf ("octave-config-%s", ver));
-     octave_binary = fullfile (octave_bindir, sprintf ("octave-%s", ver));
--    cenv = {"MKOCTFILE"; mkoctfile;
--            "OCTAVE_CONFIG"; octave_config;
-+    cenv = {"MKOCTFILE"; mkoctfile_program;
-+            "OCTAVE_CONFIG"; octave_config_program;
-             "OCTAVE"; octave_binary;
-             "INSTALLDIR"; desc.dir};
-     scenv = sprintf ("%s=\"%s\" ", cenv{:});
-@@ -1354,16 +1354,16 @@
-     if (exist (fullfile (src, "configure"), "file"))
-       flags = "";
-       if (isempty (getenv ("CC")))
--        flags = cstrcat (flags, " CC=\"", octave_config_info ("CC"), "\"");
-+        flags = cstrcat (flags, " CC=\"", octave_config_info ("-p", "CC"), "\"");
-       endif
-       if (isempty (getenv ("CXX")))
--        flags = cstrcat (flags, " CXX=\"", octave_config_info ("CXX"), "\"");
-+        flags = cstrcat (flags, " CXX=\"", octave_config_info ("-p", "CXX"), "\"");
-       endif
-       if (isempty (getenv ("AR")))
--        flags = cstrcat (flags, " AR=\"", octave_config_info ("AR"), "\"");
-+        flags = cstrcat (flags, " AR=\"", octave_config_info ("-p", "AR"), "\"");
-       endif
-       if (isempty (getenv ("RANLIB")))
--        flags = cstrcat (flags, " RANLIB=\"", octave_config_info ("RANLIB"), "\"");
-+        flags = cstrcat (flags, " RANLIB=\"", octave_config_info ("-p", "RANLIB"), "\"");
-       endif
-       [status, output] = shell (cstrcat ("cd '", src, "'; ", scenv,
-                                          "./configure --prefix=\"",
-diff --git a/src/mkoctfile.cc.in b/src/mkoctfile.cc.in
---- a/src/mkoctfile.cc.in
-+++ b/src/mkoctfile.cc.in
-@@ -213,6 +213,9 @@
-   vars["XTRA_CFLAGS"] = get_variable ("XTRA_CFLAGS", %OCTAVE_CONF_XTRA_CFLAGS%);
-   vars["XTRA_CXXFLAGS"] = get_variable ("XTRA_CXXFLAGS", %OCTAVE_CONF_XTRA_CXXFLAGS%);
- 
-+  vars["AR"] = get_variable ("AR", %OCTAVE_CONF_MKOCTFILE_AR%);
-+  vars["RANLIB"] = get_variable ("RANLIB", %OCTAVE_CONF_MKOCTFILE_RANLIB%);
-+
-   vars["DEPEND_FLAGS"] = get_variable ("DEPEND_FLAGS", %OCTAVE_CONF_DEPEND_FLAGS%);
-   vars["DEPEND_EXTRA_SED_PATTERN"] = get_variable ("DEPEND_EXTRA_SED_PATTERN", %OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%);
- 
-@@ -299,30 +302,29 @@
- "  -p VAR, --print VAR     Print configuration variable VAR.  Recognized\n"
- "                          variables are:\n"
- "\n"
--"                            ALL_CFLAGS                FLIBS\n"
--"                            ALL_CXXFLAGS              FPICFLAG\n"
--"                            ALL_FFLAGS                INCFLAGS\n"
--"                            ALL_LDFLAGS               LAPACK_LIBS\n"
--"                            BLAS_LIBS                 LDFLAGS\n"
--"                            CC                        LD_CXX\n"
--"                            CFLAGS                    LD_STATIC_FLAG\n"
--"                            CPICFLAG                  LFLAGS\n"
--"                            CPPFLAGS                  LIBCRUFT\n"
-+"                            ALL_CFLAGS                FFTW3F_LDFLAGS\n"
-+"                            ALL_CXXFLAGS              FFTW3F_LIBS\n"
-+"                            ALL_FFLAGS                FLIBS\n"
-+"                            ALL_LDFLAGS               FPICFLAG\n"
-+"                            AR                        INCFLAGS\n"
-+"                            BLAS_LIBS                 LAPACK_LIBS\n"
-+"                            CC                        LDFLAGS\n"
-+"                            CFLAGS                    LD_CXX\n"
-+"                            CPICFLAG                  LD_STATIC_FLAG\n"
-+"                            CPPFLAGS                  LFLAGS\n"
- "                            CXX                       LIBOCTAVE\n"
- "                            CXXFLAGS                  LIBOCTINTERP\n"
- "                            CXXPICFLAG                LIBS\n"
- "                            DEPEND_EXTRA_SED_PATTERN  OCTAVE_LIBS\n"
- "                            DEPEND_FLAGS              OCTAVE_LINK_DEPS\n"
--"                            DL_LD                     OCTAVE_LINK_OPTS\n"
--"                            DL_LDFLAGS                OCT_LINK_DEPS\n"
--"                            EXEEXT                    OCT_LINK_OPTS\n"
--"                            F77                       RDYNAMIC_FLAG\n"
--"                            F77_INTEGER_8_FLAG        READLINE_LIBS\n"
--"                            FFLAGS                    SED\n"
--"                            FFTW3_LDFLAGS             XTRA_CFLAGS\n"
--"                            FFTW3_LIBS                XTRA_CXXFLAGS\n"
--"                            FFTW3F_LDFLAGS\n"
--"                            FFTW3F_LIBS\n"
-+"                            DL_LD                     OCT_LINK_DEPS\n"
-+"                            DL_LDFLAGS                RANLIB\n"
-+"                            EXEEXT                    RDYNAMIC_FLAG\n"
-+"                            F77                       READLINE_LIBS\n"
-+"                            F77_INTEGER_8_FLAG        SED\n"
-+"                            FFLAGS                    XTRA_CFLAGS\n"
-+"                            FFTW3_LDFLAGS             XTRA_CXXFLAGS\n"
-+"                            FFTW3_LIBS\n"
- "\n"
- "  --link-stand-alone      Link a stand-alone executable file.\n"
- "\n"
-diff --git a/src/mkoctfile.in b/src/mkoctfile.in
---- a/src/mkoctfile.in
-+++ b/src/mkoctfile.in
-@@ -79,6 +79,9 @@
- : ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%}
- : ${XTRA_CXXFLAGS=%OCTAVE_CONF_XTRA_CXXFLAGS%}
- 
-+: ${AR=%OCTAVE_CONF_MKOCTFILE_AR%}
-+: ${RANLIB=%OCTAVE_CONF_MKOCTFILE_RANLIB%}
-+
- : ${DEPEND_FLAGS=%OCTAVE_CONF_DEPEND_FLAGS%}
- : ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%}
- 
-@@ -234,29 +237,30 @@
-   -p VAR, --print VAR     Print configuration variable VAR.  Recognized
-                           variables are:
- 
--                            ALL_CFLAGS                FFTW3F_LIBS
--                            ALL_CXXFLAGS              FLIBS
--                            ALL_FFLAGS                FPICFLAG
--                            ALL_LDFLAGS               INCFLAGS
-+                            ALL_CFLAGS                FFTW3F_LDFLAGS
-+                            ALL_CXXFLAGS              FFTW3F_LIBS
-+                            ALL_FFLAGS                FLIBS
-+                            ALL_LDFLAGS               FPICFLAG
-+                            AR                        INCFLAGS
-                             BLAS_LIBS                 LAPACK_LIBS
-                             CC                        LDFLAGS
-                             CFLAGS                    LD_CXX
-                             CPICFLAG                  LD_STATIC_FLAG
-                             CPPFLAGS                  LFLAGS
--                            CXX                       LIBCRUFT
--                            CXXFLAGS                  LIBOCTAVE
--                            CXXPICFLAG                LIBOCTINTERP
--                            DEPEND_EXTRA_SED_PATTERN  LIBS
--                            DEPEND_FLAGS              OCTAVE_LIBS
--                            DL_LD                     OCTAVE_LINK_DEPS
--                            DL_LDFLAGS                OCT_LINK_DEPS
-+                            CXX                       LIBOCTAVE
-+                            CXXFLAGS                  LIBOCTINTERP
-+                            CXXPICFLAG                LIBS
-+                            DEPEND_EXTRA_SED_PATTERN  OCTAVE_LIBS
-+                            DEPEND_FLAGS              OCTAVE_LINK_DEPS
-+                            DL_LD                     OCT_LINK_DEPS
-+                            DL_LDFLAGS                RANLIB
-                             EXEEXT                    RDYNAMIC_FLAG
-                             F77                       READLINE_LIBS
-                             F77_INTEGER_8_FLAG        SED
-                             FFLAGS                    XTRA_CFLAGS
-                             FFTW3_LDFLAGS             XTRA_CXXFLAGS
-                             FFTW3_LIBS
--                            FFTW3F_LDFLAGS
-+
- 
-   -v, --verbose           Echo commands as they are executed.
- 
diff -r a6cdc75d044b -r eb750a42bf46 src/stable-octave-5-fixes.patch
--- a/src/stable-octave-5-fixes.patch	Sun Feb 10 12:23:40 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-diff -uNr a/scripts/miscellaneous/edit.m b/scripts/miscellaneous/edit.m
---- a/scripts/miscellaneous/edit.m	2012-10-18 14:56:23.000000000 -0400
-+++ b/scripts/miscellaneous/edit.m	2013-01-24 21:55:43.272206607 -0500
-@@ -206,10 +206,11 @@
-   if (nargin < 1)
-     if (exist (FUNCTION.HOME, "dir") == 7 && (isunix () || ! ispc ()))
-       system (cstrcat ("cd \"", FUNCTION.HOME, "\" ; ",
--                      sprintf (FUNCTION.EDITOR, "")),
-+                      sprintf (undo_string_escapes (FUNCTION.EDITOR), "")),
-               [], FUNCTION.MODE);
-     else
--      system (sprintf (FUNCTION.EDITOR,""), [], FUNCTION.MODE);
-+      system (sprintf (undo_string_escapes (FUNCTION.EDITOR), ""),
-+              [], FUNCTION.MODE);
-     endif
-     return;
-   endif
-@@ -279,7 +280,8 @@
-     ## If the file exists, then edit it.
-     if (FUNCTION.EDITINPLACE)
-       ## Edit in place even if it is protected.
--      system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")),
-+      system (sprintf (undo_string_escapes (FUNCTION.EDITOR),
-+                       cstrcat ("\"", fileandpath, "\"")),
-               [], FUNCTION.MODE);
-       return;
-     else
-@@ -296,7 +298,8 @@
-       else
-         fclose (fid);
-       endif
--      system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")),
-+      system (sprintf (undo_string_escapes (FUNCTION.EDITOR),
-+                       cstrcat ("\"", fileandpath, "\"")),
-               [], FUNCTION.MODE);
-       return;
-     endif
-@@ -312,7 +315,8 @@
-     case {"cc", "m"}
-       0;
-     otherwise
--      system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")),
-+      system (sprintf (undo_string_escapes (FUNCTION.EDITOR),
-+                       cstrcat ("\"", fileandpath, "\"")),
-               [], FUNCTION.MODE);
-       return;
-   endswitch
-@@ -459,7 +463,8 @@
-   fclose (fid);
- 
-   ## Finally we are ready to edit it!
--  system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")),
-+  system (sprintf (undo_string_escapes (FUNCTION.EDITOR),
-+                   cstrcat ("\"", fileandpath, "\"")),
-           [], FUNCTION.MODE);
- 
- endfunction
diff -r a6cdc75d044b -r eb750a42bf46 src/stable-octave.mk
--- a/src/stable-octave.mk	Sun Feb 10 12:23:40 2013 -0500
+++ b/src/stable-octave.mk	Mon Feb 11 17:36:21 2013 -0500
@@ -3,7 +3,7 @@
 
 PKG             := stable-octave
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 543d0c9e9a6c5406004b86a803c34711f0cdfcdf
+$(PKG)_CHECKSUM := f9d6d13bbb6387e7fc9a7a314627414d497489c0
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE)