Mercurial > mxe-octave

changeset 3759:0023c034ec4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge away extra head
author John W. Eaton <jwe@octave.org>
date Tue, 30 Dec 2014 14:35:32 -0500
parents 9b5ec90d870b (current diff) d80808c840aa (diff)
children 1f870f80ed71
files src/build-m4-1-fixes.patch src/gdb-1-fix-shell.patch src/ghostscript.mk src/mingw-libgcrypt-1-fixes.patch src/mingw-w64-1-math-h.patch src/mingw-w64-2-float-h.patch src/stable-octave-1-xerror.patch src/stable-octave-2-xerror.patch src/stable-octave-3-termfocus.patch src/zeromq-1.patch
diffstat 146 files changed, 4262 insertions(+), 683 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Wed Jul 09 09:25:57 2014 -0400
+++ b/Makefile.in	Tue Dec 30 14:35:32 2014 -0500
@@ -1,13 +1,7 @@
 # This file is part of MXE.
 # See index.html for further information.
 
-STABLE_BUILD := @ENABLE_STABLE@
-
-ifeq ($(STABLE_BUILD),yes)
-  OCTAVE_TARGET := stable-octave
-else
-  OCTAVE_TARGET := octave
-endif
+OCTAVE_TARGET := @ENABLE_OCTAVE@octave
 
 PWD := $(shell pwd)
 TOP_DIR := $(PWD)
@@ -41,8 +35,16 @@
 # on your system (default is yes if doing native build). 
 USE_SYSTEM_FONTCONFIG := @USE_SYSTEM_FONTCONFIG@
 
+# Build compiler for 64-bit Windows.  Using this option will build
+# binaries that require a 64-bit Windows system.
+ENABLE_WINDOWS_64 := @ENABLE_WINDOWS_64@
+
 # Attempt to build Octave and dependencies with 64-bit indexing
 # enabled (experimental; requires 64-bit system and compiler).
+# Note that 64-bit indexing is NOT required simply because you have
+# 64-bit operating system.  Building Octave with 64-bit indexing is
+# still experimental, so enabling this option is discouraged unless
+# you know what you are doing.
 ENABLE_64 := @ENABLE_64@
 
 # Should match what config.guess prints for your system.
@@ -50,7 +52,7 @@
 ifeq ($(MXE_NATIVE_BUILD),yes)
   TARGET := $(shell tools/config.guess)
 else
-  ifeq ($(ENABLE_64),yes)
+  ifeq ($(ENABLE_WINDOWS_64),yes)
     TARGET := x86_64-w64-mingw32
   else
     TARGET := i686-w64-mingw32
@@ -152,6 +154,7 @@
 INSTALL    := $(shell ginstall --help >/dev/null 2>&1 && echo g)install
 PATCH      := $(shell gpatch --help >/dev/null 2>&1 && echo g)patch
 SED        := $(shell gsed --help >/dev/null 2>&1 && echo g)sed
+SORT       := $(shell gsort --help >/dev/null 2>&1 && echo g)sort
 WGET       := wget --no-check-certificate \
                    --user-agent=$(shell wget --version | \
                    $(SED) -n 's,GNU \(Wget\) \([0-9.]*\).*,\1/\2,p')
@@ -209,6 +212,11 @@
   BUILD_TOOLS := $(filter-out build-python, $(BUILD_TOOLS))
 endif
 
+# use the a native awk in native mingw
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+  REQUIREMENTS += awk
+  BUILD_TOOLS := $(filter-out build-gawk, $(BUILD_TOOLS))
+endif
 
 ifeq ($(USE_SYSTEM_GCC),yes)
   BUILD_TOOLS := $(filter-out $(BUILD_COMPILER_TOOLS), $(BUILD_TOOLS))
@@ -292,6 +300,9 @@
     MXE_PKG_CONFIG := pkg-config
     MXE_QMAKE := qmake
   endif
+
+  MXE_MOC := moc
+  MXE_UIC := uic
 else
   MXE_TOOL_PREFIX := $(TARGET)-
   MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ar'
@@ -310,6 +321,8 @@
   endif
   MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/pkg-config'
   MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake'
+  MXE_MOC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc'
+  MXE_UIC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic'
 endif
 
 ifeq ($(MXE_SYSTEM),mingw)
@@ -332,6 +345,8 @@
     MSYS_BASE_DIR := $(TOP_DIR)/msys-base
     MSYS_EXTENSION_DIR := $(TOP_DIR)/msys-extension
     MSYS_BASE_PACKAGES := $(addprefix msys-,bash coreutils diffutils dos2unix file findutils gawk grep gzip less libiconv libintl libmagic make msys-core patch regex sed tar termcap unzip zip wget)
+    MSYS_BASE_SOURCES := $(addprefix src-,$(MSYS_BASE_PACKAGES))
+    PKGS += $(MSYS_BASE_SOURCES)
 
     NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++
   endif
@@ -380,7 +395,9 @@
 endif
 
 OCTAVE_FORGE_BASE_URL := 'http://sourceforge.net/projects/octave/files/Octave Forge Packages/Individual Package Releases'
-OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows odepkg linear-algebra sockets zenity actuarial data-smoothing fuzzy-logic-toolkit quaternion fits fl-core tsa dicom netcdf)
+OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows odepkg linear-algebra sockets zenity actuarial data-smoothing fuzzy-logic-toolkit quaternion fits fl-core tsa dicom netcdf ltfat)
+# get ALL deps for all of- packages, regardless of whethe building the actual forge package in the installer
+OCTAVE_FORGE_DEPS:= $(sort $(foreach p,$(wildcard $(TOP_DIR)/src/of-*.mk),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p)))
 
 BLAS_PACKAGES := blas
 ifeq ($(ENABLE_OPENBLAS),yes)
@@ -457,8 +474,11 @@
 .PHONY: msys-base
 msys-base:  $(MSYS_BASE_PACKAGES)
 
+.PHONY: msys-base-sources
+msys-base-sources:  $(MSYS_BASE_SOURCES)
+
 .PHONY: octave-forge-packages
-octave-forge-packages: $(OCTAVE_FORGE_PACKAGES)
+octave-forge-packages: $(OCTAVE_FORGE_DEPS) $(OCTAVE_FORGE_PACKAGES)
 
 .PHONY: blas-packages
 blas-packages: $(BLAS_PACKAGES)
--- a/binary-dist-rules.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/binary-dist-rules.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -1,5 +1,5 @@
 
-ifeq ($(STABLE_BUILD),yes)
+ifeq ($(OCTAVE_TARGET),stable-octave)
   OCTAVE_DIST_NAME := octave-$($(OCTAVE_TARGET)_VERSION)
 else
   OCTAVE_DIST_NAME := octave-$(DATE)
@@ -13,9 +13,15 @@
   TAR_H_OPTION := -h
   WINDOWS_BINARY_DIST_DEPS := \
     msys-base \
-    native-binutils \
-    native-gcc \
-    npp
+    msys-base-sources
+
+  ifeq ($(MXE_NATIVE_BUILD),no)
+    WINDOWS_BINARY_DIST_DEPS += \
+      native-binutils \
+      native-gcc \
+      npp
+  endif
+
 endif
 
 BINARY_DIST_DEPS := \
@@ -48,25 +54,40 @@
 endef
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
-  define copy-windows-dist-files
-    echo "  DLL files..."
-    cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin
-    cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin
-    cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/$(build-gcc_VERSION)/*.dll $(OCTAVE_DIST_DIR)/bin
-    echo "  msys base files..."
-    cd $(TOP_DIR)/msys-base \
-      && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
-    echo "  msys extension files..."
-    cd $(TOP_DIR)/msys-extension \
-      && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
-    echo "  notepad++..."
-    cd $(TOP_DIR) \
-      && tar -c $(TAR_H_OPTION) -f - notepad++ | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
-    echo "  README.html..."
-    cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
-    echo "  refblas..."
-    cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll
-  endef
+  ifeq ($(MXE_NATIVE_BUILD),no)
+    define copy-windows-dist-files
+      echo "  DLL files..."
+      cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin
+      cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin
+      cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/$(build-gcc_VERSION)/*.dll $(OCTAVE_DIST_DIR)/bin
+      echo "  msys base files..."
+      cd $(TOP_DIR)/msys-base \
+        && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
+      echo "  msys extension files..."
+      cd $(TOP_DIR)/msys-extension \
+        && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
+      echo "  notepad++..."
+      cd $(TOP_DIR) \
+          && tar -c $(TAR_H_OPTION) -f - notepad++ | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
+      echo "  README.html..."
+      cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
+      echo "  refblas..."
+      cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll
+      echo "  octave.bat..."
+      cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)/
+    endef
+  else
+    define copy-windows-dist-files
+      echo "  DLL files..."
+      cp /mingw/bin/*.dll $(OCTAVE_DIST_DIR)/bin
+      echo "  README.html..."
+      cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
+      echo "  refblas..."
+      cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll
+      echo "  octave.bat..."
+      cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)/
+    endef
+  endif
 endif
 
 define make-dist-files-writable
--- a/build_packages.m	Wed Jul 09 09:25:57 2014 -0400
+++ b/build_packages.m	Tue Dec 30 14:35:32 2014 -0500
@@ -5,30 +5,46 @@
 if length(packagedir) > 0
   cd(packagedir);
 endif
+
+% helper function to try install a package, and recover
+function try_install (pkgname)
+  currdir = pwd ();
+ 
+  try
+    pkg ('install', pkgname, '-noauto')
+  catch err
+    warning (err.identifier, err.message);
+  end_try_catch
+
+  cd (currdir);
+endfunction
+
 % install the packages
-pkg install general-1.3.4.tar.gz
-pkg install miscellaneous-1.2.1.tar.gz
-pkg install struct-1.0.10.tar.gz
-pkg install optim-1.3.1.tar.gz
-pkg install specfun-1.1.0.tar.gz
-pkg install control-2.6.5.tar.gz
-pkg install signal-1.3.0.tar.gz
-pkg install communications-1.2.0.tar.gz
-pkg install image-2.2.1.tar.gz
-pkg install io-2.2.2.tar.gz
-pkg install statistics-1.2.3.tar.gz
-pkg install geometry-1.7.0.tar.gz
-pkg install windows-1.2.1.tar.gz
-pkg install odepkg-0.8.4.tar.gz
-pkg install linear-algebra-2.2.0.tar.gz
-pkg install sockets-1.0.8.tar.gz
-pkg install zenity-0.5.7.tar.gz
-pkg install actuarial-1.1.0.tar.gz
-pkg install data-smoothing-1.3.0.tar.gz
-pkg install fuzzy-logic-toolkit-0.4.2.tar.gz
-pkg install quaternion-2.2.1.tar.gz
-pkg install fits-1.0.5.tar.gz
-pkg install fl-core-1.0.0.tar.gz
-pkg install tsa-4.2.7.tar.gz
-pkg install dicom-0.1.1.tar.gz
-pkg install netcdf-1.0.5.tar.gz
+try_install general-1.3.4.tar.gz
+try_install miscellaneous-1.2.1.tar.gz
+try_install struct-1.0.10.tar.gz
+try_install optim-1.4.0.tar.gz
+try_install specfun-1.1.0.tar.gz
+try_install control-2.6.6.tar.gz
+try_install signal-1.3.0.tar.gz
+try_install communications-1.2.0.tar.gz
+try_install image-2.2.2.tar.gz
+try_install io-2.2.5.tar.gz
+try_install statistics-1.2.3.tar.gz
+try_install geometry-1.7.0.tar.gz
+try_install windows-1.2.1.tar.gz
+try_install odepkg-0.8.4.tar.gz
+try_install linear-algebra-2.2.0.tar.gz
+try_install sockets-1.0.8.tar.gz
+try_install zenity-0.5.7.tar.gz
+try_install actuarial-1.1.0.tar.gz
+try_install data-smoothing-1.3.0.tar.gz
+try_install fuzzy-logic-toolkit-0.4.5.tar.gz
+try_install quaternion-2.2.2.tar.gz
+try_install fits-1.0.5.tar.gz
+try_install fl-core-1.0.0.tar.gz
+try_install tsa-4.2.7.tar.gz
+try_install dicom-0.1.1.tar.gz
+try_install netcdf-1.0.5.tar.gz
+try_install ltfat-2.0.1.tar.gz
+
--- a/configure.ac	Wed Jul 09 09:25:57 2014 -0400
+++ b/configure.ac	Tue Dec 30 14:35:32 2014 -0500
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.62])
-AC_INIT([MXE-Octave], [0.0.29], [http://octave.org/bugs.html], [mxe-octave])
+AC_INIT([MXE-Octave], [0.0.34], [http://octave.org/bugs.html], [mxe-octave])
 
 AC_CONFIG_SRCDIR([src/octave.mk])
 AC_CONFIG_AUX_DIR([tools])
@@ -53,14 +53,25 @@
 esac
 AC_SUBST(SHELL)
 
-### If possible, use a 64-bit integer type for array dimensions and indexing.
+ENABLE_WINDOWS_64=no
+AC_ARG_ENABLE(windows-64,
+  [AS_HELP_STRING([--enable-windows-64],
+    [build a Windows 64 cross compiler; resulting build will work only on 64-bit Windows systems])],
+  [if test "$enableval" = yes; then ENABLE_WINDOWS_64=yes; fi], [])
 
 ENABLE_64=no
 AC_ARG_ENABLE(64,
   [AS_HELP_STRING([--enable-64],
     [(EXPERIMENTAL) use 64-bit integers for array dimensions and indexing])],
   [if test "$enableval" = yes; then ENABLE_64=yes; fi], [])
+
+if test "$ENABLE_64" = yes && test "$ENABLE_WINDOWS_64" = no; then
+  AC_MSG_WARN([--enable-64 implies --enable-windows-64])
+  ENABLE_WINDOWS_64=yes
+fi
+
 AC_SUBST(ENABLE_64)
+AC_SUBST(ENABLE_WINDOWS_64)
 
 BUILD_SHARED=yes
 AC_ARG_ENABLE(shared,
@@ -132,19 +143,36 @@
   [if test "$enableval" = no; then STRIP_DIST_FILES=no; fi], [])
 AC_SUBST(STRIP_DIST_FILES)
 
-ENABLE_OPENBLAS=no
+ENABLE_OPENBLAS=yes
 AC_ARG_ENABLE([openblas],
-  [AS_HELP_STRING([--enable-openblas],
-    [(EXPERIMENTAL) enable use of openblas in Octave])],
-  [if test "$enableval" = yes; then ENABLE_OPENBLAS=yes; fi], [])
+  [AS_HELP_STRING([--disable-openblas],
+    [Disable use of openblas in Octave])],
+  [if test "$enableval" = no; then ENABLE_OPENBLAS=no; fi], [])
 AC_SUBST(ENABLE_OPENBLAS)
 
-ENABLE_STABLE=yes
-AC_ARG_ENABLE(stable,
-  [AS_HELP_STRING([--enable-stable],
-    [Enable stable build of octave instead of devel octave])],
-  [if test "$enableval" = no; then ENABLE_STABLE=no; fi], [])
-AC_SUBST(ENABLE_STABLE)
+ENABLE_OCTAVE=stable
+AC_ARG_ENABLE([octave],
+  [AS_HELP_STRING([--enable-octave=stable],
+    [Enable a specific build of octave (stable, alpha, default)])],
+  [], [enableval=$ENABLE_OCTAVE])
+
+case $enableval in
+ stable)
+   ENABLE_OCTAVE="stable-"
+   ;;
+ alpha)
+   ENABLE_OCTAVE=""
+   ;;
+ default)
+   ENABLE_OCTAVE="default-"
+   ;;
+ *)
+   ENABLE_OCTAVE="stable-"
+   AC_MSG_WARN([Unknown octave type $enableval - using enable-octave=stable])
+   ;;
+esac
+   
+AC_SUBST(ENABLE_OCTAVE)
 
 ### Default is to cross compile for mingw.
 
--- a/dist-files.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/dist-files.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -26,10 +26,11 @@
   build-cmake.mk \
   build-flex.mk \
   build-gawk.mk \
+  build-gcc-1-mingw-float.patch \
+  build-gcc-2-intrinsics.patch \
   build-gcc.mk \
   build-gperf.mk \
   build-libtool.mk \
-  build-m4-1-fixes.patch \
   build-m4.mk \
   build-msvctools.mk \
   build-pkg-config-1-fixes.patch \
@@ -54,10 +55,14 @@
   cunit.mk \
   curl-test.c \
   curl.mk \
+  damageproto.mk \
   dbus.mk \
   dcmtk-1-fixes.patch \
   dcmtk-2-ming64.patch \
   dcmtk.mk \
+  default-octave-1-docinstall.patch \
+  default-octave-1-fixes.patch \
+  default-octave.mk \
   devil-1-png.patch \
   devil.mk \
   eigen.mk \
@@ -71,6 +76,7 @@
   fftw.mk \
   file-test.c \
   file.mk \
+  fixesproto.mk \
   flac.mk \
   fltk-1-darwin-cross-compile.patch \
   fltk-2-uuid-mod.patch \
@@ -103,8 +109,9 @@
   gd-test.c \
   gd.mk \
   gdal.mk \
-  gdb-1-fix-shell.patch \
+  gdb-1-fix-termcap.patch \
   gdb.mk \
+  gdcm-1-nosecapi.patch \
   gdcm.mk \
   gdk-pixbuf-1-fixes.patch \
   gdk-pixbuf.mk \
@@ -128,6 +135,7 @@
   gnu-linux-ghostscript-configure.patch \
   gnuplot-1-fixes.patch \
   gnuplot-2-win64.patch \
+  gnuplot-3-iconv.patch \
   gnuplot.mk \
   gnutls-1-fixes.patch \
   gnutls-test.c \
@@ -164,13 +172,16 @@
   guile-test.c \
   guile.mk \
   harfbuzz.mk \
+  hdf5-1-fixes.patch \
   hdf5.mk \
   hunspell-test.cpp \
   hunspell.mk \
+  ice.mk \
   id3lib-1-win32.patch \
   id3lib.mk \
   ilmbase.mk \
   imagemagick.mk \
+  inputproto.mk \
   intltool.mk \
   isl-1-fixes.patch \
   isl.mk \
@@ -184,6 +195,7 @@
   json-c-2-patch-remove-rpl.patch \
   json-c-test.c \
   json-c.mk \
+  kbproto.mk \
   lame-1-fix-xmmintrin-errors.patch  \
   lame-2-update-autotools.patch \
   lame.mk \
@@ -313,14 +325,13 @@
   mingw-transfig-1-fixes.patch \
   mingw-units-1-fixes.patch \
   mingw-utils-1-portability-fix.patch \
-  mingw-w64-1-math-h.patch \
-  mingw-w64-2-float-h.patch \
+  mingw-w64-1-float-h.patch \
   mingw-w64.mk \
   mingwrt.mk \
+  mman-win32-1-include_name_change.patch \
+  mman-win32.mk \
   mpc.mk \
   mpfr.mk \
-  mman-win32-1-include_name_change.patch \
-  mman-win32.mk \
   msitools.mk \
   msvc-atk-1.patch \
   msvc-build-cmake-1.patch \
@@ -424,6 +435,7 @@
   ocaml-native.mk \
   octave-1-docinstall.patch \
   octave-1-fixes.patch \
+  octave-1-gnulib-isatty.patch \
   octave.mk \
   of-actuarial.mk \
   of-communications.mk \
@@ -439,6 +451,8 @@
   of-image.mk \
   of-io.mk \
   of-linear-algebra.mk \
+  of-ltfat-1-mingw-fixes.patch \
+  of-ltfat.mk \
   of-miscellaneous.mk \
   of-netcdf.mk \
   of-odepkg.mk \
@@ -501,7 +515,9 @@
   protobuf.mk \
   pstoedit-1-fixes.patch \
   pstoedit-2-gs.patch \
+  pstoedit-3-nosecapi.patch \
   pstoedit.mk \
+  pthread-stubs.mk \
   pthreads-1-fixes.patch \
   pthreads-test.c \
   pthreads.mk \
@@ -514,6 +530,7 @@
   qjson.mk \
   qrupdate-1-fixes.patch \
   qrupdate.mk \
+  qscintilla-1-transpose-fix.patch \
   qscintilla-2-bang-fix.patch \
   qscintilla.mk \
   qt-1-cherrypicks.patch \
@@ -532,6 +549,7 @@
   readline-1-sigwinch.patch \
   readline-2-event-hook.patch \
   readline.mk \
+  renderproto.mk \
   sdl-test.c \
   sdl.mk \
   sdl_image-test.c \
@@ -547,17 +565,41 @@
   sdl_sound-test.c \
   sdl_sound.mk \
   sdl_ttf.mk \
+  sm.mk \
   smpeg-test.c \
   smpeg.mk \
   sox-test.c \
   sox.mk \
   speex.mk \
   sqlite.mk \
+  src-msys-bash.mk \
+  src-msys-coreutils.mk \
+  src-msys-diffutils.mk \
+  src-msys-dos2unix.mk \
+  src-msys-file.mk \
+  src-msys-findutils.mk \
+  src-msys-gawk.mk \
+  src-msys-grep.mk \
+  src-msys-gzip.mk \
+  src-msys-less.mk \
+  src-msys-libiconv.mk \
+  src-msys-libintl.mk \
+  src-msys-libmagic.mk \
+  src-msys-make.mk \
+  src-msys-msys-core.mk \
+  src-msys-patch.mk \
+  src-msys-regex.mk \
+  src-msys-sed.mk \
+  src-msys-tar.mk \
+  src-msys-termcap.mk \
+  src-msys-unzip.mk \
+  src-msys-wget.mk \
+  src-msys-zip.mk \
   stable-octave-1-docinstall.patch \
   stable-octave-1-fixes.patch \
-  stable-octave-1-xerror.patch \
-  stable-octave-2-xerror.patch \
-  stable-octave-3-termfocus.patch \
+  stable-octave-1-gnulib-isatty.patch \
+  stable-octave-2-winbelloff.patch \
+  stable-octave-3-fixes.patch \
   stable-octave.mk \
   suitesparse-1.patch \
   suitesparse.mk \
@@ -605,12 +647,23 @@
   wt.mk \
   wxwidgets-test.cpp \
   wxwidgets.mk \
+  x11.mk \
   x264-1-fix-bin-bash.patch \
   x264.mk \
   xapian-core.mk \
+  xau.mk \
+  xcb-proto.mk \
+  xcb.mk \
+  xdamage.mk \
+  xdmcp.mk \
   xerces-1-fix-pkgconfig.patch \
   xerces-test.cpp \
   xerces.mk \
+  xext.mk \
+  xextproto.mk \
+  xf86vidmodeproto.mk \
+  xfixes.mk \
+  xft.mk \
   xine-lib-1-configure_ac.patch \
   xine-lib-2-build_fixes.patch \
   xine-lib-3-more_build_fixes.patch \
@@ -618,11 +671,15 @@
   xine-lib-5-change_mma_h_to_mma_win32_h.patch \
   xine-lib.mk \
   xmlwrapp.mk \
+  xproto.mk \
+  xrender.mk \
+  xt.mk \
+  xtrans.mk \
   xvidcore.mk \
+  xxf86vm.mk \
   xz.mk \
   yasm.mk \
   zenity.mk \
-  zeromq-1.patch \
   zeromq.mk \
   zlib-1-win32-static.patch \
   zlib.mk \
@@ -760,6 +817,7 @@
 
 INSTALL_FILES_1 := \
   gpl-3.0.txt \
+  octave.bat \
   octave.bmp \
   octave-hdr.bmp \
   octave-logo.ico \
--- a/index.html	Wed Jul 09 09:25:57 2014 -0400
+++ b/index.html	Tue Dec 30 14:35:32 2014 -0500
@@ -761,20 +761,19 @@
     </p>
 
     <h3 id="requirements-mingw">MingW</h3>
-    Make sure to update and upgrade packages as some of the default versions
-    of packages are too old to work correctly.
-    <pre>mingw-get update</pre>
-    <pre>mingw-get upgrade</pre>
     <p>
-    And then get required packages.
-    <pre>mingw-get install autoconf bash msys-bison msys-flex gcc gcc-c++ \
-	      gcc-fortran gettext msys-m4 msys-make msys-sed \
-	      libiconv msys-openssl msys-patch msys-perl \
-              msys-libarchive msys-unzip msys-wget msys-bsdtar
+    Get required packages by running:
+    </p>
+    <pre>mingw-get install gcc gcc-c++ gcc-fortran mingw32-make \
+              msys-autoconf msys-bash msys-bison msys-bsdtar \
+              msys-flex msys-gettext mysys-libiconv \
+              msys-libarchive msys-libz msys-m4 msys-make \
+              msys-openssl msys-patch msys-perl msys-sed \
+              msys-unzip msys-wget 
     </pre>
     <p>
     You will also need to install Windows versions of python  
-    and ghostscript and ensure they are in visisble in the PATH.
+    and ensure it is visisble in the PATH.
     <p>
 
     <h3 id="requirements-opensuse">openSUSE</h3>
@@ -1091,6 +1090,10 @@
         <td class="website"><a href="http://curl.haxx.se/libcurl/">cURL</a></td>
     </tr>
     <tr>
+        <td class="package">damageproto</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">damageproto</a></td>
+    </tr>
+    <tr>
         <td class="package">dbus</td>
         <td class="website"><a href="http://dbus.freedesktop.org/">dbus</a></td>
     </tr>
@@ -1099,6 +1102,10 @@
         <td class="website"><a href="http://dicom.offis.de/dcmtk.php.en">DCMTK</a></td>
     </tr>
     <tr>
+        <td class="package">default-octave</td>
+        <td class="website"><a href="http://octave.org/">Octave</a></td>
+    </tr>
+    <tr>
         <td class="package">devil</td>
         <td class="website"><a href="http://openil.sourceforge.net/">DevIL</a></td>
     </tr>
@@ -1131,6 +1138,10 @@
         <td class="website"><a href="http://www.darwinsys.com/file/">file</a></td>
     </tr>
     <tr>
+        <td class="package">fixesproto</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">fixesproto</a></td>
+    </tr>
+    <tr>
         <td class="package">flac</td>
         <td class="website"><a href="http://www.xiph.org/ogg/">FLAC</a></td>
     </tr>
@@ -1339,6 +1350,10 @@
         <td class="website"><a href="http://hunspell.sourceforge.net/">Hunspell</a></td>
     </tr>
     <tr>
+        <td class="package">ice</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">ice</a></td>
+    </tr>
+    <tr>
         <td class="package">id3lib</td>
         <td class="website"><a href="http://id3lib.sourceforge.net/">id3lib</a></td>
     </tr>
@@ -1351,6 +1366,10 @@
         <td class="website"><a href="http://www.imagemagick.org/">ImageMagick</a></td>
     </tr>
     <tr>
+        <td class="package">inputproto</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">inputproto></a></td>
+    </tr>
+    <tr>
         <td class="package">intltool</td>
         <td class="website"><a href="https://launchpad.net/intltool/+download">intltool</a></td>
     </tr>
@@ -1379,6 +1398,10 @@
         <td class="website"><a href="http://oss.metaparadigm.com/json-c/">json-c</a></td>
     </tr>
     <tr>
+        <td class="package">kbproto</td>
+        <td class="website"><a href="http://xorg.freedesktop.org">kbproto></a></td>
+    </tr>
+    <tr>
         <td class="package">lame</td>
         <td class="website"><a href="http://lame.sourceforge.net/">lame</a></td>
     </tr>
@@ -1855,6 +1878,10 @@
         <td class="website"><a href="http://octave.sf.net/">Octave Forge linear-algebra package</a></td>
     </tr>
     <tr>
+        <td class="package">of-ltfat</td>
+        <td class="website"><a href="http://octave.sf.net/">Octave Forge ltfat package</a></td>
+    </tr>
+    <tr>
         <td class="package">of-miscellaneous</td>
         <td class="website"><a href="http://octave.sf.net/">Octave Forge miscellaneous package</a></td>
     </tr>
@@ -2027,6 +2054,10 @@
         <td class="website"><a href="http://www.pstoedit.net"</a></td>
     </tr>
     <tr>
+        <td class="package">pthread-stubs</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">pthread-stubs</a></td>
+    </tr>
+    <tr>
         <td class="package">pthreads</td>
         <td class="website"><a href="http://sourceware.org/pthreads-win32/">Pthreads-w32</a></td>
     </tr>
@@ -2067,6 +2098,10 @@
         <td class="website"><a href="http://tiswww.case.edu/php/chet/readline/rltop.html">Readline</a></td>
     </tr>
     <tr>
+        <td class="package">renderproto</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">renderproto></a></td>
+    </tr>
+    <tr>
         <td class="package">sdl</td>
         <td class="website"><a href="http://www.libsdl.org/">SDL</a></td>
     </tr>
@@ -2095,6 +2130,10 @@
         <td class="website"><a href="http://www.libsdl.org/projects/SDL_ttf/">SDL_ttf</a></td>
     </tr>
     <tr>
+        <td class="package">sm</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">sm</a></td>
+    </tr>
+    <tr>
         <td class="package">smpeg</td>
         <td class="website"><a href="http://icculus.org/smpeg/">smpeg</a></td>
     </tr>
@@ -2207,6 +2246,10 @@
         <td class="website"><a href="http://www.wxwidgets.org/">wxWidgets</a></td>
     </tr>
     <tr>
+        <td class="package">x11</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">X11</a></td>
+    </tr>
+    <tr>
         <td class="package">x264</td>
         <td class="website"><a href="http://www.videolan.org/developers/x264.html">x264</a></td>
     </tr>
@@ -2215,10 +2258,50 @@
         <td class="website"><a href="http://xapian.org/">Xapian-Core</a></td>
     </tr>
     <tr>
+        <td class="package">xau</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xau</a></td>
+    </tr>
+    <tr>
+        <td class="package">xcb</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xcb</a></td>
+    </tr>
+    <tr>
+        <td class="package">xcb-proto</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xcb-proto</a></td>
+    </tr>
+    <tr>
+        <td class="package">xdamage</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xdamage</a></td>
+    </tr>
+    <tr>
+        <td class="package">xdmcp</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xdmcp</a></td>
+    </tr>
+    <tr>
         <td class="package">xerces</td>
         <td class="website"><a href="http://xerces.apache.org/xerces-c/">Xerces-C++</a></td>
     </tr>
     <tr>
+        <td class="package">xext</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xext</a></td>
+    </tr>
+    <tr>
+        <td class="package">xextproto</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xextproto</a></td>
+    </tr>
+    <tr>
+        <td class="package">xfixes</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xfixes</a></td>
+    </tr>
+    <tr>
+        <td class="package">xf86vidmodeproto</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xf86vidmodeproto</a></td>
+    </tr>
+    <tr>
+        <td class="package">xft</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xft</a></td>
+    </tr>
+    <tr>
         <td class="package">xine-lib</td>
         <td class="website"><a href="http://www.xine-project.org/">xine-lib</a></td>
     </tr>
@@ -2227,10 +2310,30 @@
         <td class="website"><a href="http://sourceforge.net/projects/xmlwrapp/">xmlwrapp</a></td>
     </tr>
     <tr>
+        <td class="package">xproto</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xproto></a></td>
+    </tr>
+    <tr>
+        <td class="package">xrender</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xrender</a></td>
+    </tr>
+    <tr>
+        <td class="package">xt</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xt</a></td>
+    </tr>
+    <tr>
+        <td class="package">xtrans</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xtrans</a></td>
+    </tr>
+    <tr>
         <td class="package">xvidcore</td>
         <td class="website"><a href="http://www.xvid.org/">xvidcore</a></td>
     </tr>
     <tr>
+        <td class="package">xxf86vm</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xxf86vm</a></td>
+    </tr>
+    <tr>
         <td class="package">xz</td>
         <td class="website"><a href="http://tukaani.org/xz/">XZ</a></td>
     </tr>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/installer-files/octave.bat	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,42 @@
+@echo off
+Rem   Find Octave's install directory through cmd.exe variables.
+Rem   This batch file should reside in Octaves installation subdir!
+Rem
+Rem   This trick finds the location where the batch file resides.
+Rem   Note: the result ends with a backslash
+set OCT_HOME=%~dp0
+
+Rem   Set up PATH. Make sure the octave bin dir
+Rem   comes first.
+
+set PATH=%OCT_HOME%bin;%PATH%
+
+Rem   Set up any environment vars we may need
+
+set TERM=cygwin
+
+Rem   Check for args to see if we are told to start GUI
+Rem   with the --force-gui option or not (--no-gui)
+Rem   Otherwise assume starting as command line
+set GUI_MODE=1
+:checkargs
+if -%1-==-- goto noargs
+  if NOT %1==--force-gui goto notguiarg
+    set GUI_MODE=1
+:notguiarg
+  if NOT %1==--no-gui goto notnoguiarg
+    set GUI_MODE=0
+:notnoguiarg
+  shift
+  goto  checkargs
+:noargs
+
+Rem   Start Octave (this detaches and immediately returns):
+if %GUI_MODE%==1 (
+start octave-gui.exe %*
+) else (
+start octave-cli.exe %*
+)
+
+Rem   Close the batch file's cmd.exe window
+exit
--- a/makeinst-script.sh	Wed Jul 09 09:25:57 2014 -0400
+++ b/makeinst-script.sh	Tue Dec 30 14:35:32 2014 -0500
@@ -41,7 +41,7 @@
 !define DESCRIPTION "GNU Octave is a high-level programming language, primarily intended for numerical computations."
 !define INSTALLER_FILES "../installer-files"
 !define INSTALLER_NAME "octave-$OCTAVE_VERSION-installer.exe"
-!define MAIN_APP_EXE "octave-gui.exe"
+!define MAIN_APP_EXE "octave.bat"
 !define INSTALL_TYPE "SetShellVarContext current"
 !define PRODUCT_ROOT_KEY "HKLM"
 !define PRODUCT_KEY "Software\\Octave-$VERSION"
@@ -104,12 +104,13 @@
 
 Page custom octaveOptionsPage octaveOptionsLeave
 
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckPrevInstall
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckPrevInstallAndDest
 !insertmacro MUI_PAGE_DIRECTORY
 
 !insertmacro MUI_PAGE_INSTFILES
 
-!define MUI_FINISHPAGE_RUN "\$INSTDIR\\bin\\\${MAIN_APP_EXE}"
+!define MUI_FINISHPAGE_RUN "\$WINDIR\\explorer.exe"
+!define MUI_FINISHPAGE_RUN_PARAMETERS "\$INSTDIR\\\${MAIN_APP_EXE}"
 !define MUI_FINISHPAGE_SHOWREADME "\$INSTDIR\\README.html"
 !insertmacro MUI_PAGE_FINISH
 
@@ -215,6 +216,10 @@
   SetOutPath "\$INSTDIR" 
   File "$OCTAVE_SOURCE/README.html"
 
+  ; include the octave.bat file
+  SetOutPath "\$INSTDIR" 
+  File "$OCTAVE_SOURCE/octave.bat"
+
   ; distro files
 EOF
 
@@ -257,13 +262,8 @@
  CreateDirectory "\$SMPROGRAMS\\Octave-$VERSION"
  CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
  SetOutPath "%USERPROFILE%"
- \${If} \$IsWin8 == 1
-   CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "-i --line-editing" "\$INSTDIR\\$ICON" 0
-   CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "-i --line-editing" "\$INSTDIR\\$ICON" 0
- \${Else}
-   CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0
-   CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
- \${EndIf}
+ CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\octave.bat" "--no-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED
+ CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\octave.bat" "--force-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED
  SetOutPath "\$INSTDIR"
 EOF
   # if we have documentation files, create shortcuts
@@ -281,13 +281,8 @@
 
   \${If} \$InstallShortcuts == \${BST_CHECKED}
     SetOutPath "%USERPROFILE%"
-    \${If} \$IsWin8 == 1
-       CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "-i --line-editing" "\$INSTDIR\\$ICON" 0
-       CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "-i --line-editing" "\$INSTDIR\\$ICON" 0
-    \${Else}
-       CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0
-       CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
-    \${EndIf}
+    CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\octave.bat" "--no-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED
+    CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\octave.bat" "--force-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED
   \${Endif}
 
   ; BLAS set up
@@ -306,7 +301,7 @@
   WriteRegStr HKCR "Octave.Document.$VERSION" "" "GNU Octave Script"
   WriteRegStr HKCR "Octave.Document.$VERSION\\DefaultIcon" "" "\$INSTDIR\\$ICON"
   ; document actions
-  WriteRegStr HKCR "Octave.Document.$VERSION\\shell\\open\\command" "" "\$\\"\$INSTDIR\\bin\\octave-gui.exe\$\\" --force-gui --persist --eval \$\\"edit '%1'\$\\""
+  WriteRegStr HKCR "Octave.Document.$VERSION\\shell\\open\\command" "" "\$\\"\$INSTDIR\\octave.bat\$\\" --force-gui --persist --eval \$\\"edit '%1'\$\\""
 
   \${If} \$RegisterOctaveFileType == \${BST_CHECKED}
     ReadRegStr \$0 HKCR ".m" ""
@@ -433,13 +428,36 @@
   Pop \$0
 FunctionEnd
 
-; Check whether prev install is here
-Function CheckPrevInstall 
+; Check whether prev install is here and no spaces in dest name
+Function CheckPrevInstallAndDest
   IfFileExists "\$INSTDIR\\bin\\octave.exe" inst_exists  inst_none
 inst_exists:
   MessageBox MB_YESNO|MB_ICONEXCLAMATION "Another Octave installation has been detected at that destination. It is recommended to uninstall it if you intend to use the same installation directory. Do you want to proceed with the installation anyway?" IDYES inst_none IDNO 0
   Abort 
+  GoTo inst_end
 inst_none:
+
+
+  ; check for spaces in dest filename
+  Push \$R0
+  Push \$R1
+
+  StrCpy \$R1 0 # r1 = counter
+space_loop:
+  StrCpy \$R0 \$INSTDIR 1 \$R1  # R0 = character in string to check
+  StrCmp \$R0 "" space_end # end of string
+  StrCmp \$R0 " " space_found
+  IntOp  \$R1 \$R1 + 1
+  GoTo space_loop
+space_found:
+  MessageBox MB_OK|MB_ICONEXCLAMATION "Octave should not be installed to a destination folder containing spaces. Please select another destination."
+  Abort 
+space_end:
+  Pop \$R1
+  Pop \$R0
+
+inst_end:
+
 FunctionEnd
 
 ; Function to check Java Runtime Environment
--- a/src/arpack.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/arpack.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -9,11 +9,16 @@
 $(PKG)_FILE     := arpack-ng_$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/$($(PKG)_FILE)
 $(PKG)_DEPS     := blas lapack
+$(PKG)_DESTDIR  := '$(3)'
 
 ifeq ($(MXE_NATIVE_BUILD),yes)
   $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
 endif
 
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+  $(PKG)_DESTDIR := 
+endif
+
 ifeq ($(USE_PIC_FLAG),yes)
   $(PKG)_CONFIGURE_PIC_OPTION := --with-pic
 endif
@@ -22,8 +27,6 @@
   $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := FFLAGS="-g -O2 -fdefault-integer-8"
 endif
 
-$(PKG)_BLAS_LIB := blas
-
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package arpack.' >&2;
     echo $(arpack_VERSION)
@@ -42,10 +45,10 @@
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
 
     if [ $(BUILD_STATIC) = yes ]; then \
-      $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'; \
+      $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$($(PKG)_DESTDIR)'; \
     fi
 
     if [ $(BUILD_SHARED) = yes ]; then \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/.build/.libs/libarpack.a' --install '$(INSTALL)' --libdir '$(3)$(HOST_LIBDIR)' --bindir '$(3)$(HOST_BINDIR)' -llapack -l$($(PKG)_BLAS_LIB); \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/.build/.libs/libarpack.a' --install '$(INSTALL)' --libdir '$($(PKG)_DESTDIR)$(HOST_LIBDIR)' --bindir '$($(PKG)_DESTDIR)$(HOST_BINDIR)' -llapack -lblas; \
     fi
 endef
--- a/src/build-cmake.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/build-cmake.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,11 +3,11 @@
 
 PKG             := build-cmake
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.8.12.2
-$(PKG)_CHECKSUM := cca70b307aa32a6a32c72e01fdfcecc84c1c2690
+$(PKG)_VERSION  := 3.0.2
+$(PKG)_CHECKSUM := 379472e3578902a1d6f8b68a9987773151d6f21a
 $(PKG)_SUBDIR   := cmake-$($(PKG)_VERSION)
 $(PKG)_FILE     := cmake-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://www.cmake.org/files/v2.8/$($(PKG)_FILE)
+$(PKG)_URL      := http://www.cmake.org/files/v3.0/$($(PKG)_FILE)
 $(PKG)_DEPS     := 
 
 define $(PKG)_UPDATE
--- a/src/build-gawk.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/build-gawk.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -15,6 +15,18 @@
     echo $($(PKG)_VERSION)
 endef
 
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+define $(PKG)_BUILD
+    # copy from pc folder
+    cp    '$(1)'/pc/*.* '$(1)'
+    cp    '$(1)/pc/Makefile' '$(1)'
+    cp    '$(1)/pc/Makefile.ext' '$(1)/extension/Makefile'
+    cp    '$(1)/pc/Makefile.tst' '$(1)/test/Makefile'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' mingw32
+    $(MAKE) -C '$(1)/extension' -j '$(JOBS)' 
+    $(MAKE) -C '$(1)' -j 1 install prefix=$(BUILD_TOOLS_PREFIX) 
+endef
+else
 define $(PKG)_BUILD
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \
@@ -22,3 +34,4 @@
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
 endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/build-gcc-1-mingw-float.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,32 @@
+This file is part of MXE.
+See index.html for further information.
+
+This patch has been taken from:
+http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html
+http://sourceforge.net/p/mingw/bugs/1809
+
+diff --git a/gcc/ginclude/float.h b/gcc/ginclude/float.h
+index a8e05bf..23fbb3d 100644
+--- a/gcc/ginclude/float.h
++++ b/gcc/ginclude/float.h
+@@ -275,3 +275,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ #endif /* __STDC_WANT_DEC_FP__ */
+ 
+ #endif /* _FLOAT_H___ */
++
++#ifdef __MINGW32__
++ /*
++  * the MinGW-supplied header, which is guarded by the
++  * _MINGW_FLOAT_H_ macro, may be found first, thus...
++  */
++#ifndef _MINGW_FLOAT_H_
++ /*
++  * ...when we didn't find the MinGW-supplied header first, we
++  * want to pull it in now; include_next should achieve this
++  */
++# include_next <float.h>
++#endif
++#endif
+-- 
+1.8.4.5
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/build-gcc-2-intrinsics.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,846 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+This patch has been taken from:
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56038
+
+diff --git a/gcc/config/i386/adxintrin.h b/gcc/config/i386/adxintrin.h
+index 6118900..a83410d 100644
+--- a/gcc/config/i386/adxintrin.h
++++ b/gcc/config/i386/adxintrin.h
+@@ -28,6 +28,10 @@
+ #ifndef _ADXINTRIN_H_INCLUDED
+ #define _ADXINTRIN_H_INCLUDED
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline unsigned char
+ __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _addcarryx_u32 (unsigned char __CF, unsigned int __X,
+@@ -46,4 +50,8 @@ _addcarryx_u64 (unsigned char __CF, unsigned long __X,
+ }
+ #endif
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _ADXINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/ammintrin.h b/gcc/config/i386/ammintrin.h
+index a89b204..a370eb0 100644
+--- a/gcc/config/i386/ammintrin.h
++++ b/gcc/config/i386/ammintrin.h
+@@ -36,6 +36,10 @@
+ #define __DISABLE_SSE4A__
+ #endif /* __SSE4A__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline void __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _mm_stream_sd (double * __P, __m128d __Y)
+ {
+@@ -85,6 +89,10 @@ _mm_inserti_si64(__m128i __X, __m128i __Y, unsigned const int __I, unsigned cons
+ 				      (unsigned int)(I), (unsigned int)(L)))
+ #endif
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #ifdef __DISABLE_SSE4A__
+ #undef __DISABLE_SSE4A__
+ #pragma GCC pop_options
+diff --git a/gcc/config/i386/avx2intrin.h b/gcc/config/i386/avx2intrin.h
+index d04c972..2c0d6e7 100644
+--- a/gcc/config/i386/avx2intrin.h
++++ b/gcc/config/i386/avx2intrin.h
+@@ -34,6 +34,10 @@
+ #define __DISABLE_AVX2__
+ #endif /* __AVX2__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* Sum absolute 8-bit integer difference of adjacent groups of 4
+    byte integers in the first 2 operands.  Starting offsets within
+    operands are determined by the 3rd mask operand.  */
+@@ -1886,4 +1890,8 @@ _mm256_mask_i64gather_epi32 (__m128i src, int const *base,
+ #pragma GCC pop_options
+ #endif /* __DISABLE_AVX2__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _AVX2INTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/avxintrin.h b/gcc/config/i386/avxintrin.h
+index 2ea327c..f61d850 100644
+--- a/gcc/config/i386/avxintrin.h
++++ b/gcc/config/i386/avxintrin.h
+@@ -37,6 +37,10 @@
+ #define __DISABLE_AVX__
+ #endif /* __AVX__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* Internal data types for implementing the intrinsics.  */
+ typedef double __v4df __attribute__ ((__vector_size__ (32)));
+ typedef float __v8sf __attribute__ ((__vector_size__ (32)));
+@@ -1460,4 +1464,8 @@ _mm256_castsi128_si256 (__m128i __A)
+ #pragma GCC pop_options
+ #endif /* __DISABLE_AVX__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _AVXINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/bmi2intrin.h b/gcc/config/i386/bmi2intrin.h
+index ff96296..b01e1e1 100644
+--- a/gcc/config/i386/bmi2intrin.h
++++ b/gcc/config/i386/bmi2intrin.h
+@@ -34,6 +34,10 @@
+ #define __DISABLE_BMI2__
+ #endif /* __BMI2__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline unsigned int
+ __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _bzhi_u32 (unsigned int __X, unsigned int __Y)
+@@ -106,4 +110,8 @@ _mulx_u32 (unsigned int __X, unsigned int __Y, unsigned int *__P)
+ #pragma GCC pop_options
+ #endif /* __DISABLE_BMI2__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _BMI2INTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/bmiintrin.h b/gcc/config/i386/bmiintrin.h
+index b2d7c60..c8ad38a 100644
+--- a/gcc/config/i386/bmiintrin.h
++++ b/gcc/config/i386/bmiintrin.h
+@@ -34,6 +34,10 @@
+ #define __DISABLE_BMI__
+ #endif /* __BMI__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline unsigned short __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ __tzcnt_u16 (unsigned short __X)
+ {
+@@ -181,4 +185,8 @@ _tzcnt_u64 (unsigned long long __X)
+ #pragma GCC pop_options
+ #endif /* __DISABLE_BMI__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _BMIINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/cpuid.h b/gcc/config/i386/cpuid.h
+index 8c323ae..52047e3 100644
+--- a/gcc/config/i386/cpuid.h
++++ b/gcc/config/i386/cpuid.h
+@@ -21,6 +21,10 @@
+  * <http://www.gnu.org/licenses/>.
+  */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* %ecx */
+ #define bit_SSE3	(1 << 0)
+ #define bit_PCLMUL	(1 << 1)
+@@ -275,3 +279,8 @@ __get_cpuid (unsigned int __level,
+   __cpuid (__level, *__eax, *__ebx, *__ecx, *__edx);
+   return 1;
+ }
++
++#ifdef __cplusplus
++}
++#endif
++
+diff --git a/gcc/config/i386/emmintrin.h b/gcc/config/i386/emmintrin.h
+index a2bdf0e..2c4af53 100644
+--- a/gcc/config/i386/emmintrin.h
++++ b/gcc/config/i386/emmintrin.h
+@@ -36,6 +36,10 @@
+ #define __DISABLE_SSE2__
+ #endif /* __SSE2__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* SSE2 */
+ typedef double __v2df __attribute__ ((__vector_size__ (16)));
+ typedef long long __v2di __attribute__ ((__vector_size__ (16)));
+@@ -1515,6 +1519,10 @@ _mm_castps_pd(__m128 __A)
+   return (__m128d) __A;
+ }
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ extern __inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _mm_castps_si128(__m128 __A)
+ {
+diff --git a/gcc/config/i386/f16cintrin.h b/gcc/config/i386/f16cintrin.h
+index 1181f8b..5cc37dd 100644
+--- a/gcc/config/i386/f16cintrin.h
++++ b/gcc/config/i386/f16cintrin.h
+@@ -34,6 +34,10 @@
+ #define __DISABLE_F16C__
+ #endif /* __F16C__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline float __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _cvtsh_ss (unsigned short __S)
+ {
+@@ -95,4 +99,8 @@ _mm256_cvtps_ph (__m256 __A, const int __I)
+ #pragma GCC pop_options
+ #endif /* __DISABLE_F16C__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _F16CINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/fma4intrin.h b/gcc/config/i386/fma4intrin.h
+index e1bdef7..0ee2bf8 100644
+--- a/gcc/config/i386/fma4intrin.h
++++ b/gcc/config/i386/fma4intrin.h
+@@ -37,6 +37,10 @@
+ #define __DISABLE_FMA4__
+ #endif /* __FMA4__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* 128b Floating point multiply/add type instructions.  */
+ extern __inline __m128 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _mm_macc_ps (__m128 __A, __m128 __B, __m128 __C)
+@@ -233,6 +237,10 @@ _mm256_msubadd_pd (__m256d __A, __m256d __B, __m256d __C)
+   return (__m256d) __builtin_ia32_vfmaddsubpd256 ((__v4df)__A, (__v4df)__B, -(__v4df)__C);
+ }
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #ifdef __DISABLE_FMA4__
+ #undef __DISABLE_FMA4__
+ #pragma GCC pop_options
+diff --git a/gcc/config/i386/fmaintrin.h b/gcc/config/i386/fmaintrin.h
+index bfbb75d..806ff8e 100644
+--- a/gcc/config/i386/fmaintrin.h
++++ b/gcc/config/i386/fmaintrin.h
+@@ -34,6 +34,10 @@
+ #define __DISABLE_FMA__
+ #endif /* __FMA__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline __m128d
+ __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _mm_fmadd_pd (__m128d __A, __m128d __B, __m128d __C)
+@@ -294,6 +298,10 @@ _mm256_fmsubadd_ps (__m256 __A, __m256 __B, __m256 __C)
+                                                 -(__v8sf)__C);
+ }
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #ifdef __DISABLE_FMA__
+ #undef __DISABLE_FMA__
+ #pragma GCC pop_options
+diff --git a/gcc/config/i386/fxsrintrin.h b/gcc/config/i386/fxsrintrin.h
+index 98e73ee..34cc3cb 100644
+--- a/gcc/config/i386/fxsrintrin.h
++++ b/gcc/config/i386/fxsrintrin.h
+@@ -34,6 +34,10 @@
+ #define __DISABLE_FXSR__
+ #endif /* __FXSR__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline void
+ __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _fxsave (void *__P)
+@@ -70,4 +74,8 @@ _fxrstor64 (void *__P)
+ #endif /* __DISABLE_FXSR__ */
+ 
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _FXSRINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/gmm_malloc.h b/gcc/config/i386/gmm_malloc.h
+index 516b13b..c55db44 100644
+--- a/gcc/config/i386/gmm_malloc.h
++++ b/gcc/config/i386/gmm_malloc.h
+@@ -27,6 +27,10 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ static __inline__ void* 
+ _mm_malloc (size_t size, size_t align)
+ {
+@@ -71,4 +75,8 @@ _mm_free (void * aligned_ptr)
+     free (((void **) aligned_ptr) [-1]);
+ }
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _MM_MALLOC_H_INCLUDED */
+diff --git a/gcc/config/i386/ia32intrin.h b/gcc/config/i386/ia32intrin.h
+index 614b0fa..d8e474e 100644
+--- a/gcc/config/i386/ia32intrin.h
++++ b/gcc/config/i386/ia32intrin.h
+@@ -25,6 +25,10 @@
+ # error "Never use <ia32intrin.h> directly; include <x86intrin.h> instead."
+ #endif
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* 32bit bsf */
+ extern __inline int
+ __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+@@ -297,3 +301,7 @@ __writeeflags (unsigned int X)
+ #define _rotwr(a,b)		__rorw((a), (b))
+ #define _rotl(a,b)		__rold((a), (b))
+ #define _rotr(a,b)		__rord((a), (b))
++
++#ifdef __cplusplus
++}
++#endif
+diff --git a/gcc/config/i386/immintrin.h b/gcc/config/i386/immintrin.h
+index 73b4859..49a03e4 100644
+--- a/gcc/config/i386/immintrin.h
++++ b/gcc/config/i386/immintrin.h
+@@ -78,6 +78,10 @@ _rdrand16_step (unsigned short *__P)
+   return __builtin_ia32_rdrand16_step (__P);
+ }
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline int
+ __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _rdrand32_step (unsigned int *__P)
+@@ -174,4 +178,8 @@ _rdrand64_step (unsigned long long *__P)
+ 
+ #endif /* __x86_64__  */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _IMMINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/lwpintrin.h b/gcc/config/i386/lwpintrin.h
+index 1cd046a..26d65f1 100644
+--- a/gcc/config/i386/lwpintrin.h
++++ b/gcc/config/i386/lwpintrin.h
+@@ -34,6 +34,10 @@
+ #define __DISABLE_LWP__
+ #endif /* __LWP__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline void __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ __llwpcb (void *pcbAddress)
+ {
+@@ -71,6 +75,9 @@ __lwpval64 (unsigned long long data2, unsigned int data1, unsigned int flags)
+ #endif
+ #endif
+ 
++#ifdef __cplusplus
++}
++#endif
+ 
+ #ifdef __OPTIMIZE__
+ extern __inline unsigned char __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+diff --git a/gcc/config/i386/lzcntintrin.h b/gcc/config/i386/lzcntintrin.h
+index b680a35..d292f24 100644
+--- a/gcc/config/i386/lzcntintrin.h
++++ b/gcc/config/i386/lzcntintrin.h
+@@ -35,6 +35,10 @@
+ #define __DISABLE_LZCNT__
+ #endif /* __LZCNT__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline unsigned short __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ __lzcnt16 (unsigned short __X)
+ {
+@@ -72,4 +76,8 @@ _lzcnt_u64 (unsigned long long __X)
+ #pragma GCC pop_options
+ #endif /* __DISABLE_LZCNT__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _LZCNTINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/mm3dnow.h b/gcc/config/i386/mm3dnow.h
+index bf847f9..464e98f 100644
+--- a/gcc/config/i386/mm3dnow.h
++++ b/gcc/config/i386/mm3dnow.h
+@@ -36,6 +36,10 @@
+ #define __DISABLE_3dNOW__
+ #endif /* __3dNOW__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline void __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _m_femms (void)
+ {
+@@ -210,6 +214,10 @@ _m_pswapd (__m64 __A)
+ 
+ #endif /* __3dNOW_A__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #ifdef __DISABLE_3dNOW__
+ #undef __DISABLE_3dNOW__
+ #pragma GCC pop_options
+diff --git a/gcc/config/i386/mmintrin.h b/gcc/config/i386/mmintrin.h
+index b351200..eaee690 100644
+--- a/gcc/config/i386/mmintrin.h
++++ b/gcc/config/i386/mmintrin.h
+@@ -33,6 +33,10 @@
+ #define __DISABLE_MMX__
+ #endif /* __MMX__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* The Intel API is flexible enough that we must allow aliasing with other
+    vector types, and their scalar components.  */
+ typedef int __m64 __attribute__ ((__vector_size__ (8), __may_alias__));
+@@ -939,4 +943,8 @@ _mm_set1_pi8 (char __b)
+ #pragma GCC pop_options
+ #endif /* __DISABLE_MMX__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _MMINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
+index 3be2f35..f8c99c7 100644
+--- a/gcc/config/i386/pmm_malloc.h
++++ b/gcc/config/i386/pmm_malloc.h
+@@ -34,6 +34,10 @@ extern int posix_memalign (void **, size_t, size_t);
+ extern "C" int posix_memalign (void **, size_t, size_t) throw ();
+ #endif
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ static __inline void *
+ _mm_malloc (size_t size, size_t alignment)
+ {
+@@ -54,4 +58,8 @@ _mm_free (void * ptr)
+   free (ptr);
+ }
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _MM_MALLOC_H_INCLUDED */
+diff --git a/gcc/config/i386/pmmintrin.h b/gcc/config/i386/pmmintrin.h
+index 6a79500..2c98a85 100644
+--- a/gcc/config/i386/pmmintrin.h
++++ b/gcc/config/i386/pmmintrin.h
+@@ -36,6 +36,10 @@
+ #define __DISABLE_SSE3__
+ #endif /* __SSE3__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* Additional bits in the MXCSR.  */
+ #define _MM_DENORMALS_ZERO_MASK		0x0040
+ #define _MM_DENORMALS_ZERO_ON		0x0040
+@@ -124,6 +128,10 @@ _mm_mwait (unsigned int __E, unsigned int __H)
+   __builtin_ia32_mwait (__E, __H);
+ }
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #ifdef __DISABLE_SSE3__
+ #undef __DISABLE_SSE3__
+ #pragma GCC pop_options
+diff --git a/gcc/config/i386/popcntintrin.h b/gcc/config/i386/popcntintrin.h
+index 41845d8..285e96a 100644
+--- a/gcc/config/i386/popcntintrin.h
++++ b/gcc/config/i386/popcntintrin.h
+@@ -30,6 +30,10 @@
+ #define __DISABLE_POPCNT__
+ #endif /* __POPCNT__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* Calculate a number of bits set to 1.  */
+ extern __inline int __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _mm_popcnt_u32 (unsigned int __X)
+@@ -50,4 +54,8 @@ _mm_popcnt_u64 (unsigned long long __X)
+ #pragma GCC pop_options
+ #endif  /* __DISABLE_POPCNT__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _POPCNTINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/prfchwintrin.h b/gcc/config/i386/prfchwintrin.h
+index b2f5772..f779a28 100644
+--- a/gcc/config/i386/prfchwintrin.h
++++ b/gcc/config/i386/prfchwintrin.h
+@@ -28,10 +28,18 @@
+ #ifndef _PRFCHWINTRIN_H_INCLUDED
+ #define _PRFCHWINTRIN_H_INCLUDED
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline void __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _m_prefetchw (void *__P)
+ {
+   __builtin_prefetch (__P, 1, 3 /* _MM_HINT_T0 */);
+ }
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _PRFCHWINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/rdseedintrin.h b/gcc/config/i386/rdseedintrin.h
+index 0ab18e5..98eb318 100644
+--- a/gcc/config/i386/rdseedintrin.h
++++ b/gcc/config/i386/rdseedintrin.h
+@@ -35,6 +35,10 @@
+ #endif /* __RDSEED__ */
+ 
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline int
+ __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _rdseed16_step (unsigned short *p)
+@@ -63,4 +67,8 @@ _rdseed64_step (unsigned long long *p)
+ #pragma GCC pop_options
+ #endif /* __DISABLE_RDSEED__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _RDSEEDINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/rtmintrin.h b/gcc/config/i386/rtmintrin.h
+index ac40d22..3aa8246 100644
+--- a/gcc/config/i386/rtmintrin.h
++++ b/gcc/config/i386/rtmintrin.h
+@@ -34,6 +34,10 @@
+ #define __DISABLE_RTM__
+ #endif /* __RTM__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ #define _XBEGIN_STARTED		(~0u)
+ #define _XABORT_EXPLICIT	(1 << 0)
+ #define _XABORT_RETRY		(1 << 1)
+@@ -81,4 +85,8 @@ _xabort (const unsigned int imm)
+ #pragma GCC pop_options
+ #endif /* __DISABLE_RTM__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _RTMINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/smmintrin.h b/gcc/config/i386/smmintrin.h
+index 886ace4..0922b45 100644
+--- a/gcc/config/i386/smmintrin.h
++++ b/gcc/config/i386/smmintrin.h
+@@ -37,6 +37,10 @@
+ #define __DISABLE_SSE4_1__
+ #endif /* __SSE4_1__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* Rounding mode macros. */
+ #define _MM_FROUND_TO_NEAREST_INT	0x00
+ #define _MM_FROUND_TO_NEG_INF		0x01
+@@ -822,6 +826,10 @@ _mm_cmpgt_epi64 (__m128i __X, __m128i __Y)
+ #define __DISABLE_SSE4_2__
+ #endif /* __SSE4_1__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ /* Accumulate CRC32 (polynomial 0x11EDC6F41) value.  */
+ extern __inline unsigned int __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _mm_crc32_u8 (unsigned int __C, unsigned char __V)
+diff --git a/gcc/config/i386/tbmintrin.h b/gcc/config/i386/tbmintrin.h
+index 871f532..744b9ca 100644
+--- a/gcc/config/i386/tbmintrin.h
++++ b/gcc/config/i386/tbmintrin.h
+@@ -34,6 +34,10 @@
+ #define __DISABLE_TBM__
+ #endif /* __TBM__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ #ifdef __OPTIMIZE__
+ extern __inline unsigned int __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ __bextri_u32 (unsigned int __X, const unsigned int __I)
+@@ -177,4 +181,8 @@ __tzmsk_u64 (unsigned long long __X)
+ #pragma GCC pop_options
+ #endif /* __DISABLE_TBM__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _TBMINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/tmmintrin.h b/gcc/config/i386/tmmintrin.h
+index 89556d2..f89e33c 100644
+--- a/gcc/config/i386/tmmintrin.h
++++ b/gcc/config/i386/tmmintrin.h
+@@ -36,6 +36,10 @@
+ #define __DISABLE_SSSE3__
+ #endif /* __SSSE3__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _mm_hadd_epi16 (__m128i __X, __m128i __Y)
+ {
+@@ -241,6 +245,10 @@ _mm_abs_pi32 (__m64 __X)
+   return (__m64) __builtin_ia32_pabsd ((__v2si)__X);
+ }
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #ifdef __DISABLE_SSSE3__
+ #undef __DISABLE_SSSE3__
+ #pragma GCC pop_options
+diff --git a/gcc/config/i386/wmmintrin.h b/gcc/config/i386/wmmintrin.h
+index 2002375..a22bb07 100644
+--- a/gcc/config/i386/wmmintrin.h
++++ b/gcc/config/i386/wmmintrin.h
+@@ -30,6 +30,10 @@
+ /* We need definitions from the SSE2 header file.  */
+ #include <emmintrin.h>
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* AES */
+ 
+ #ifndef __AES__
+@@ -124,6 +128,10 @@ _mm_clmulepi64_si128 (__m128i __X, __m128i __Y, const int __I)
+ 					  (__v2di)(__m128i)(Y), (int)(I)))
+ #endif
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #ifdef __DISABLE_PCLMUL__
+ #undef __DISABLE_PCLMUL__
+ #pragma GCC pop_options
+diff --git a/gcc/config/i386/xmmintrin.h b/gcc/config/i386/xmmintrin.h
+index a3824e7..ee1a1fc 100644
+--- a/gcc/config/i386/xmmintrin.h
++++ b/gcc/config/i386/xmmintrin.h
+@@ -64,6 +64,10 @@ _mm_prefetch (const void *__P, enum _mm_hint __I)
+ #define __DISABLE_SSE__
+ #endif /* __SSE__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* The Intel API is flexible enough that we must allow aliasing with other
+    vector types, and their scalar components.  */
+ typedef float __m128 __attribute__ ((__vector_size__ (16), __may_alias__));
+@@ -1254,6 +1258,10 @@ do {									\
+   (row3) = __builtin_ia32_movhlps (__t3, __t2);				\
+ } while (0)
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ /* For backward source compatibility.  */
+ # include <emmintrin.h>
+ 
+diff --git a/gcc/config/i386/xopintrin.h b/gcc/config/i386/xopintrin.h
+index cc82bc5..d567a98 100644
+--- a/gcc/config/i386/xopintrin.h
++++ b/gcc/config/i386/xopintrin.h
+@@ -36,6 +36,10 @@
+ #define __DISABLE_XOP__
+ #endif /* __XOP__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* Integer multiply/add intructions. */
+ extern __inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _mm_maccs_epi16(__m128i __A, __m128i __B, __m128i __C)
+@@ -836,6 +840,10 @@ _mm256_permute2_ps (__m256 __X, __m256 __Y, __m256i __C, const int __I)
+  					  (int)(I)))
+ #endif /* __OPTIMIZE__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #ifdef __DISABLE_XOP__
+ #undef __DISABLE_XOP__
+ #pragma GCC pop_options
+diff --git a/gcc/config/i386/xsaveintrin.h b/gcc/config/i386/xsaveintrin.h
+index 47be25f..be2caea 100644
+--- a/gcc/config/i386/xsaveintrin.h
++++ b/gcc/config/i386/xsaveintrin.h
+@@ -34,6 +34,10 @@
+ #define __DISABLE_XSAVE__
+ #endif /* __XSAVE__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline void
+ __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _xsave (void *__P, long long __M)
+@@ -69,4 +73,8 @@ _xrstor64 (void *__P, long long __M)
+ #pragma GCC pop_options
+ #endif /* __DISABLE_XSAVE__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _XSAVEINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/xsaveoptintrin.h b/gcc/config/i386/xsaveoptintrin.h
+index d7534b4..90eeb45 100644
+--- a/gcc/config/i386/xsaveoptintrin.h
++++ b/gcc/config/i386/xsaveoptintrin.h
+@@ -34,6 +34,10 @@
+ #define __DISABLE_XSAVEOPT__
+ #endif /* __XSAVEOPT__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern __inline void
+ __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _xsaveopt (void *__P, long long __M)
+@@ -55,4 +59,8 @@ _xsaveopt64 (void *__P, long long __M)
+ #pragma GCC pop_options
+ #endif /* __DISABLE_XSAVEOPT__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _XSAVEOPTINTRIN_H_INCLUDED */
+diff --git a/gcc/config/i386/xtestintrin.h b/gcc/config/i386/xtestintrin.h
+index ba79e5c..864b727 100644
+--- a/gcc/config/i386/xtestintrin.h
++++ b/gcc/config/i386/xtestintrin.h
+@@ -34,6 +34,10 @@
+ #define __DISABLE_RTM__
+ #endif /* __RTM__ */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* Return non-zero if the instruction executes inside an RTM or HLE code
+    region.  Return zero otherwise.   */
+ extern __inline int
+@@ -48,4 +52,8 @@ _xtest (void)
+ #pragma GCC pop_options
+ #endif /* __DISABLE_RTM__ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _XTESTINTRIN_H_INCLUDED */
+-- 
+1.8.4.5
+
--- a/src/build-gcc.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/build-gcc.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := build-gcc
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.9.0
-$(PKG)_CHECKSUM := fbde8eb49f2b9e6961a870887cf7337d31cd4917
+$(PKG)_VERSION  := 4.9.2
+$(PKG)_CHECKSUM := 79dbcb09f44232822460d80b033c962c0237c6d8
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -34,7 +34,7 @@
     --disable-win32-registry \
     --with-native-system-header-dir='/include' \
     --enable-threads=win32
-  ifneq ($(ENABLE_64),yes)
+  ifneq ($(TARGET),x86_64-w64-mingw32)
     $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
       --disable-sjlj-exceptions
   endif
@@ -80,10 +80,10 @@
         --prefix='$(BUILD_TOOLS_PREFIX)' \
         --enable-languages='c,c++,fortran' \
         --disable-multilib \
+        --disable-libsanitizer \
         $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-libgomp \
-        --disable-libmudflap \
         --with-cloog='$(BUILD_TOOLS_PREFIX)' \
         --with-gmp='$(BUILD_TOOLS_PREFIX)' \
         --with-isl='$(BUILD_TOOLS_PREFIX)' \
--- a/src/build-m4-1-fixes.patch	Wed Jul 09 09:25:57 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-diff -uNr a/lib/stdio.in.h b/lib/stdio.in.h
---- a/lib/stdio.in.h	2011-03-01 11:39:29.000000000 -0500
-+++ b/lib/stdio.in.h	2013-08-05 22:30:54.870325354 -0400
-@@ -158,12 +158,6 @@
-                  "use gnulib module fflush for portable POSIX compliance");
- #endif
- 
--/* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
--#undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
--
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--- a/src/build-m4.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/build-m4.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := build-m4
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.4.16
-$(PKG)_CHECKSUM := 44b3ed8931f65cdab02aee66ae1e49724d2551a4
+$(PKG)_VERSION  := 1.4.17
+$(PKG)_CHECKSUM := 4f80aed6d8ae3dacf97a0cb6e989845269e342f0
 $(PKG)_SUBDIR   := m4-$($(PKG)_VERSION)
 $(PKG)_FILE     := m4-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/m4/$($(PKG)_FILE)
--- a/src/build-xz.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/build-xz.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := build-xz
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.0.5
-$(PKG)_CHECKSUM := 26fec2c1e409f736e77a85e4ab314dc74987def0
+$(PKG)_VERSION  := 5.0.7
+$(PKG)_CHECKSUM := da6d81015333785fc9399ab129e6f53fe1cbf350
 $(PKG)_SUBDIR   := xz-$($(PKG)_VERSION)
 $(PKG)_FILE     := xz-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://tukaani.org/xz/$($(PKG)_FILE)
--- a/src/cfitsio.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/cfitsio.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -4,7 +4,7 @@
 PKG             := cfitsio
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 3370
-$(PKG)_CHECKSUM := dbe3cc6981951d29200f442f4ab318f8899f9cc8
+$(PKG)_CHECKSUM := 48bd6389dcff3228508eec70384f2cae3a88ff32
 $(PKG)_SUBDIR   := $(PKG)
 $(PKG)_FILE     := $(PKG)$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/$($(PKG)_FILE)
@@ -16,8 +16,10 @@
 endif
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package cfitsio.' >&2;
-    echo $(cfitsio_VERSION)
+    $(WGET) -q -O- "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/?C=M;O=D" | \
+    grep -i '<a href="cfitsio.*tar' | \
+    $(SED) -n 's,.*cfitsio\([0-9][^>]*\)\.tar.*,\1,p' | \
+    head -1
 endef
 
 ifeq ($(MXE_SYSTEM),msvc)
--- a/src/curl.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/curl.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := curl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 7.37.0
-$(PKG)_CHECKSUM := 0bcd1bd7901ee1d7059189d2b3807fdb6a271bc6
+$(PKG)_VERSION  := 7.39.0
+$(PKG)_CHECKSUM := a72fa6615d112960be609cdcf720f6332da822db
 $(PKG)_SUBDIR   := curl-$($(PKG)_VERSION)
 $(PKG)_FILE     := curl-$($(PKG)_VERSION).tar.lzma
 $(PKG)_URL      := http://curl.haxx.se/download/$($(PKG)_FILE)
@@ -29,9 +29,4 @@
         --with-libssh2 && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)' -j '$(JOBS)' DESTDIR='$(3)' install
 
-##    '$(MXE_CC)' \
-##        -W -Wall -Werror -ansi -pedantic \
-##        '$(2).c' -o '$(HOST_BINDIR)/test-curl.exe' \
-##        `'$(MXE_PKG_CONFIG)' libcurl --cflags --libs`
-
 endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/damageproto.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := damageproto
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.2.1
+$(PKG)_CHECKSUM := 6df5eccd2914ecb7c24ec0099b477aa5943c22ab
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/proto/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/default-octave-1-docinstall.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,16 @@
+diff -ur a/doc/interpreter/Makefile.in b/doc/interpreter/Makefile.in
+--- a/doc/interpreter/Makefile.in	2013-12-27 17:01:52.000000000 -0500
++++ b/doc/interpreter/Makefile.in	2014-01-21 12:47:59.618865568 -0500
+@@ -2435,8 +2435,10 @@
+ 	  if test -d "$$d2"; then \
+ 	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
+ 	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+-	    echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+-	    $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
++	    for htm in "$$d2"/*; do \
++	      echo " $(INSTALL_DATA) '$$htm' '$(DESTDIR)$(htmldir)/$$f'"; \
++	      $(INSTALL_DATA) "$$htm" "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
++	    done; \
+ 	  else \
+ 	    list2="$$list2 $$d2"; \
+ 	  fi; \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/default-octave-1-fixes.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,11 @@
+--- a/libgnu/unistd.in.h	2013-11-26 03:43:39.000000000 -0500
++++ b/libgnu/unistd.in.h	2014-02-16 16:21:36.254338221 -0500
+@@ -714,7 +714,7 @@
+    Null terminate it if the name is shorter than LEN.
+    If the host name is longer than LEN, set errno = EINVAL and return -1.
+    Return 0 if successful, otherwise set errno and return -1.  */
+-# if @UNISTD_H_HAVE_WINSOCK2_H@
++# if !@HAVE_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+ #   undef gethostname
+ #   define gethostname rpl_gethostname
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/default-octave.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,140 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+## We omit the package checksum so that we don't have to update it
+## each time the tarball changes on the hydra site.
+
+PKG             := default-octave
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 4.1.0+
+$(PKG)_CHECKSUM := ## No checksum
+$(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
+$(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://hydra.nixos.org/job/gnu/octave-default/tarball/latest/download
+ifeq ($(USE_SYSTEM_FONTCONFIG),no)
+  $(PKG)_FONTCONFIG := fontconfig
+endif
+$(PKG)_DEPS     := blas arpack curl fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
+ifeq ($(MXE_WINDOWS_BUILD),no)
+  $(PKG)_DEPS += x11 xext
+endif
+ifeq ($(ENABLE_64),no)
+  $(PKG)_DEPS += qhull
+endif
+ifeq ($(ENABLE_JIT),yes)
+  $(PKG)_DEPS += llvm
+  $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit
+else
+  $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit
+endif
+
+ifeq ($(ENABLE_JAVA),no)
+  $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := --disable-java
+else
+  ifeq ($(MXE_SYSTEM),mingw)
+    ifeq ($(MXE_NATIVE_BUILD),no)
+      $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := \
+       --with-java-includedir="$(HOST_INCDIR)/java"
+     endif
+  endif
+endif
+
+ifneq ($(ENABLE_DOCS),yes)
+  $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
+endif
+
+ifeq ($(MXE_NATIVE_BUILD),yes)
+  $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
+  ifeq ($(ENABLE_64),yes)
+    $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull F77_INTEGER_8_FLAG=-fdefault-integer-8
+  endif
+else
+  ifeq ($(MXE_SYSTEM),mingw)
+    $(PKG)_CROSS_CONFIG_OPTIONS := \
+      FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
+      gl_cv_func_gettimeofday_clobber=no
+    ifeq ($(ENABLE_64),yes)
+      $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes
+    endif
+  endif
+endif
+
+ifeq ($(MXE_SYSTEM),msvc)
+  $(PKG)_PREFIX := '$(HOST_PREFIX)/local/$($(PKG)_SUBDIR)'
+  # - Enable atomic refcount (required for QtHandles)
+  # - Skip configure test for pow and sqrt, MSVC fails to compile them
+  #   because it uses intrinsics (with -O2 flag) and bump on the fake
+  #   "char FUNC()" forward declaration.
+  # - Override CFLAGS and CXXFLAGS to disable some warnings.
+  $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
+    --enable-atomic-refcount \
+    ac_cv_func_pow=yes ac_cv_func_sqrt=yes \
+    CFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068' \
+    CXXFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068'
+else
+  $(PKG)_PREFIX := '$(HOST_PREFIX)'
+  $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
+    LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)'
+endif
+
+ifeq ($(MXE_SYSTEM),mingw)
+  $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no
+endif
+
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
+    echo $($(PKG)_VERSION)
+endef
+
+define $(PKG)_BUILD
+    # jni install
+    if [ "$(MXE_SYSTEM)" == "mingw" ] \
+      && [ "$(MXE_NATIVE_BUILD)" == "no" ] \
+      && [ "$(ENABLE_JAVA)" == "yes" ]; then \
+      if [ ! -f $(HOST_INCDIR)/java/jni.h ]; then \
+        mkdir -p '$(HOST_INCDIR)/java'; \
+        $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \
+          -O $(HOST_INCDIR)/java/jni.h; \
+      fi; \
+      if [ ! -f $(HOST_INCDIR)/java/win32/jni_md.h ]; then \
+        mkdir -p '$(HOST_INCDIR)/java/win32'; \
+        $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \
+          -O $(HOST_INCDIR)/java/win32/jni_md.h; \
+      fi; \
+    fi
+
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$($(PKG)_PREFIX)' \
+        $($(PKG)_CROSS_CONFIG_OPTIONS) \
+        $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \
+        $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \
+        $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \
+        $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \
+        $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
+        PKG_CONFIG='$(MXE_PKG_CONFIG)' \
+        PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \
+        && $(CONFIGURE_POST_HOOK)
+
+    ## We want both of these install steps so that we install in the
+    ## location set by the configure --prefix option, and the other
+    ## in a directory tree that will have just Octave files.
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+
+    if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \
+      cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \
+    fi
+
+    if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \
+        $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \
+    fi
+
+    if [ $(MXE_SYSTEM) != msvc ]; then \
+        $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_DIR)/octave install; \
+    fi
+
+    # create a file with latest installed octave rev in it
+    echo "$($(PKG)_VERSION)" > $(TOP_DIR)/octave/octave-version
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/fixesproto.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := fixesproto
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 5.0
+$(PKG)_CHECKSUM := 9efd241f9769fd6eec0cf74f338740a1f80c5885
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/proto/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- a/src/fltk.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/fltk.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -8,14 +8,13 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR)-source.tar.gz
 $(PKG)_URL      := http://fltk.org/pub/fltk/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_DEPS     := zlib jpeg libpng
 ifeq ($(MXE_SYSTEM),mingw)
-  $(PKG)_DEPS   := zlib jpeg libpng pthreads uuid
+  $(PKG)_DEPS   += pthreads uuid
+else ifeq ($(MXE_SYSTEM),msvc)
+  $(PKG)_DEPS   += freetype
 else
-ifeq ($(MXE_SYSTEM),msvc)
-  $(PKG)_DEPS   := zlib jpeg libpng freetype
-else
-  $(PKG)_DEPS   := zlib jpeg libpng pthreads freetype
-endif
+  $(PKG)_DEPS   += pthreads freetype x11 xext xrender xdmcp
 endif
 
 define $(PKG)_UPDATE
--- a/src/fontconfig.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/fontconfig.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := fontconfig
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.11.0
-$(PKG)_CHECKSUM := 969818b0326ac08241b11cbeaa4f203699f9b550
+$(PKG)_VERSION  := 2.11.1
+$(PKG)_CHECKSUM := 08565feea5a4e6375f9d8a7435dac04e52620ff2
 $(PKG)_SUBDIR   := fontconfig-$($(PKG)_VERSION)
 $(PKG)_FILE     := fontconfig-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://fontconfig.org/release/$($(PKG)_FILE)
--- a/src/freetype.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/freetype.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := freetype
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.4.10
-$(PKG)_CHECKSUM := 73b2c28fcaf1ff5b8beef3af4c5abe4cb1ecb7dc
+$(PKG)_VERSION  := 2.5.3
+$(PKG)_CHECKSUM := d3c26cc17ec7fe6c36f4efc02ef92ab6aa3f4b46
 $(PKG)_SUBDIR   := freetype-$($(PKG)_VERSION)
 $(PKG)_FILE     := freetype-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -21,7 +21,8 @@
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' && $(CONFIGURE_POST_HOOK)
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install DESTDIR='$(3)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' 
+    $(MAKE) -C '$(1)' -j 1 install DESTDIR='$(3)'
 
     rm -f '$(3)$(HOST_LIBDIR)/libfreetype.la'
 endef
--- a/src/gcc-cloog.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/gcc-cloog.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -12,6 +12,7 @@
 $(PKG)_DEPS     := gcc-gmp gcc-isl
 
 define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
     echo $(cloog_VERSION)
 endef
 
--- a/src/gcc-gmp.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/gcc-gmp.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -12,6 +12,7 @@
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
     echo $(gmp_VERSION)
 endef
 
--- a/src/gcc-isl.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/gcc-isl.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -12,6 +12,7 @@
 $(PKG)_DEPS     := gcc-gmp
 
 define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
     echo $(isl_VERSION)
 endef
 
--- a/src/gcc-mpc.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/gcc-mpc.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -12,6 +12,7 @@
 $(PKG)_DEPS     := gcc-gmp gcc-mpfr
 
 define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
     echo $(mpc_VERSION)
 endef
 
--- a/src/gcc-mpfr.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/gcc-mpfr.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -12,6 +12,7 @@
 $(PKG)_DEPS     := gcc-gmp
 
 define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
     echo $(mpfr_VERSION)
 endef
 
--- a/src/gdb-1-fix-shell.patch	Wed Jul 09 09:25:57 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch has been taken from:
-http://sourceware.org/bugzilla/show_bug.cgi?id=9098
-
---- a/gdb/gdbserver/Makefile.in        2010-01-05 02:03:00.000000000 +1100
-+++ b/gdb/gdbserver/Makefile.in        2010-05-21 23:49:45.960860228 +1000
-@@ -41,7 +41,7 @@
- htmldir = $(prefix)/html
- includedir = @includedir@
-
--SHELL = /bin/sh
-+SHELL = @SHELL@
- EXEEXT = @EXEEXT@
-
- INSTALL = @INSTALL@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gdb-1-fix-termcap.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+This file is part of MXE.
+See index.html for further information.
+
+diff -ur gdb-7.5.1_old/gdb/windows-termcap.c gdb-7.5.1/gdb/windows-termcap.c
+--- gdb-7.5.1_old/gdb/windows-termcap.c	2012-12-13 13:28:37.527194089 -0300
++++ gdb-7.5.1/gdb/windows-termcap.c	2012-12-13 13:29:54.823190855 -0300
+@@ -18,7 +18,15 @@
+ 
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++#include "config.h"
+ 
++#if defined (HAVE_NCURSES_TERM_H)
++#elif defined (HAVE_TERM_H)
++#else
++/* On MinGW, a real termcap library is usually not present.  Stub versions
++   of the termcap functions will be built from windows-termcap.c.  Readline
++   provides its own extern declarations when there's no termcap.h; do the
++   same here for the termcap functions used in GDB.  */
+ #include <stdlib.h>
+ 
+ /* -Wmissing-prototypes */
+@@ -71,3 +79,4 @@
+ {
+   return NULL;
+ }
++#endif
--- a/src/gdb.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/gdb.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -2,8 +2,8 @@
 # See index.html for further information.
 
 PKG             := gdb
-$(PKG)_VERSION  := 7.5
-$(PKG)_CHECKSUM := 79b61152813e5730fa670c89e5fc3c04b670b02c
+$(PKG)_VERSION  := 7.7.1
+$(PKG)_CHECKSUM := 35228319f7c715074a80be42fff64c7645227a80
 $(PKG)_SUBDIR   := gdb-$($(PKG)_VERSION)
 $(PKG)_FILE     := gdb-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gdcm-1-nosecapi.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,17 @@
+diff -ur gdcm-2.0.19.orig/Source/Common/gdcmException.h gdcm-2.0.19/Source/Common/gdcmException.h
+--- gdcm-2.0.19.orig/Source/Common/gdcmException.h	2014-07-26 11:45:31 -0400
++++ gdcm-2.0.19/Source/Common/gdcmException.h	2014-07-26 11:57:11 -0400
+@@ -14,6 +14,13 @@
+ #ifndef GDCMEXCEPTION_H
+ #define GDCMEXCEPTION_H
+ 
++#ifdef __MINGW32__
++  #include <_mingw.h>
++  #ifdef MINGW_HAS_SECURE_API
++    #undef MINGW_HAS_SECURE_API
++  #endif
++#endif
++
+ #include <cassert>
+ #include <cstdlib> // NULL
+ #include <exception>
--- a/src/gettext.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/gettext.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -39,5 +39,5 @@
         $(if $(filter msvc,$(MXE_SYSTEM)),ac_cv_func_memset=yes) \
         CONFIG_SHELL=$(SHELL) && $(CONFIGURE_POST_HOOK)
      $(MAKE) -C '$(1)/gettext-tools' -j '$(JOBS)' 
-     $(MAKE) -C '$(1)/gettext-tools' -j 1 install DESTDIR='$(3)'
+     $(MAKE) -C '$(1)/gettext-tools' -j 1 install DESTDIR='$(3)' bin_PROGRAMS=
 endef
--- a/src/ghostscript.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/ghostscript.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -8,7 +8,14 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://downloads.ghostscript.com/public/$($(PKG)_FILE)
-$(PKG)_DEPS     := jpeg libpng tiff zlib
+$(PKG)_DEPS     := jpeg lcms libpng tiff zlib
+ifeq ($(MXE_WINDOWS_BUILD),no)
+  $(PKG)_DEPS += x11 xext
+endif
+
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+    $(PKG)_DEPS += lcms
+endif
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package ghostscript.' >&2;
@@ -19,6 +26,10 @@
 
 ifeq ($(MXE_NATIVE_BUILD),yes)
   define $(PKG)_BUILD
+    # in native mingw, force it to use external lcm2
+    if [ "$(MXE_SYSTEM)" == "mingw" ]; then \
+        rm -rf '$(1)/lcms2'; \
+    fi
     cd '$(1)' && autoreconf
     cd '$(1)' && '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
@@ -27,7 +38,11 @@
         --with-system-libtiff \
         && $(CONFIGURE_POST_HOOK)
 
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
+    if [ "$(MXE_SYSTEM)" == "mingw" ]; then \
+        $(MAKE) -C '$(1)' -j '$(JOBS)' GS_LIB_DEFAULT=""; \
+    else \
+        $(MAKE) -C '$(1)' -j '$(JOBS)'; \
+    fi
     $(MAKE) -C '$(1)' install
   endef
 else
--- a/src/gl2ps.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/gl2ps.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)-source
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tgz
 $(PKG)_URL      := http://geuz.org/$(PKG)/src/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
+$(PKG)_DEPS     := xft
 
 
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
--- a/src/glpk-1-fixes.patch	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/glpk-1-fixes.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -1,23 +1,11 @@
-diff -ur glpk-4.52.1.orig/configure.ac glpk-4.52.1/configure.ac
---- glpk-4.52.1.orig/configure.ac	2013-10-18 07:53:54 -0400
-+++ glpk-4.52.1/configure.ac	2013-10-18 08:00:53 -0400
-@@ -54,7 +54,7 @@
- dnl Check for programs
- AC_PROG_CC
- AC_PROG_INSTALL
--AC_PROG_LIBTOOL
-+LT_INIT([win32-dll])
- 
- dnl Check for math library
- AC_CHECK_LIB([m], [exp])
-diff -ur glpk-4.52.1.orig/src/Makefile.am glpk-4.52.1/src/Makefile.am
---- glpk-4.52.1.orig/src/Makefile.am	2013-10-18 07:53:54 -0400
-+++ glpk-4.52.1/src/Makefile.am	2013-10-18 08:02:15 -0400
-@@ -17,6 +17,7 @@
- -I$(srcdir)/zlib
+diff -ur glpk-4.54.orig/src/Makefile.am glpk-4.54/src/Makefile.am
+--- glpk-4.54.orig/src/Makefile.am	2014-08-05 07:17:56 -0400
++++ glpk-4.54/src/Makefile.am	2014-08-05 07:19:02 -0400
+@@ -18,6 +18,7 @@
  
  libglpk_la_LDFLAGS = \
+ -version-info 37:1:1 \
 +-no-undefined \
- -version-info 36:1:0 \
  -export-symbols-regex '^glp_*'
  
+ libglpk_la_SOURCES = \
--- a/src/glpk.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/glpk.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,16 +3,17 @@
 
 PKG             := glpk
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.52.1
-$(PKG)_CHECKSUM := 63fd6788f95adb52789767b19e38cfb58dda331e
+$(PKG)_VERSION  := 4.54
+$(PKG)_CHECKSUM := 69d9c5d83271d34de1a58d2de2f7ababab975492
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := glpk-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/glpk/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package glpk.' >&2;
-    echo $(glpk_VERSION)
+    $(WGET) -q -O- 'http://ftp.gnu.org/gnu/glpk/?C=M;O=D' | \
+    $(SED) -n 's,.*<a href="glpk-\([0-9][^"]*\)\.tar.*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
@@ -23,5 +24,6 @@
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' && $(CONFIGURE_POST_HOOK)
-    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
+    $(MAKE) -C '$(1)/.build' -j 1 install DESTDIR='$(3)'
 endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gnuplot-3-iconv.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,15 @@
+diff -ur gnuplot-4.6.4.orig/config/mingw/Makefile gnuplot-4.6.4/config/mingw/Makefile
+--- gnuplot-4.6.4.orig/config/mingw/Makefile	2014-07-24 20:30:33 -0400
++++ gnuplot-4.6.4/config/mingw/Makefile	2014-07-24 20:30:50 -0400
+@@ -382,8 +382,9 @@
+ endif
+ 
+ ifdef ICONV
+-	CFLAGS += -DHAVE_ICONV
+-	TERMLIBS += -liconv
++	CFLAGS += -DHAVE_ICONV $(ICONV_CFLAGS)
++        LDFLAGS += $(ICONV_LDFLAGS)
++	TERMLIBS += -liconv 
+ endif
+ 
+ ifdef GNU_RC
--- a/src/gnuplot.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/gnuplot.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -10,6 +10,10 @@
 $(PKG)_URL      := http://sourceforge.net/projects/gnuplot/files/gnuplot/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+    $(PKG)_EXTRAFLAGS := ICONV_CFLAGS='-I$(HOST_INCDIR)' ICONV_LDFLAGS='-L$(HOST_LIBDIR)'
+endif
+
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package gnuplot.' >&2;
     echo $(gnuplot_VERSION)
@@ -17,8 +21,8 @@
 
 ifeq ($(MXE_SYSTEM),mingw)
 define $(PKG)_BUILD
-    make -C '$(1)/config/mingw' CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot.exe gnuplot.exe
-    make -C '$(1)/config/mingw' CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe
+    make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot.exe gnuplot.exe
+    make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe
 
     $(INSTALL) -d '$(3)$(HOST_BINDIR)'
     $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(3)$(HOST_BINDIR)'
--- a/src/gnutls.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/gnutls.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -2,11 +2,12 @@
 # See index.html for further information.
 
 PKG             := gnutls
-$(PKG)_VERSION  := 3.2.15
-$(PKG)_CHECKSUM := 31f289b48b0bf054f5f8c16d3b878615d0ae06fc
+$(PKG)_VERSION  := 3.2.20
+$(PKG)_CHECKSUM := 6b104f737330ff2f6833b8c5d80e1cd2c3fcfb66
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://ftp.gnu.org/gnu/gnutls/$($(PKG)_FILE)
+$(PKG)_URL      := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/$($(PKG)_FILE)
+$(PKG)_URL_2    := http://mirrors.dotsrc.org/gnupg/gnutls/v3.2/$($(PKG)_FILE)
 $(PKG)_DEPS     := gettext nettle pcre zlib
 
 define $(PKG)_UPDATE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdf5-1-fixes.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,12 @@
+diff -uNr a/config/gnu-flags b/config/gnu-flags
+--- a/config/gnu-flags	2012-10-11 13:31:46.000000000 -0400
++++ b/config/gnu-flags	2014-08-20 14:36:48.118651735 -0400
+@@ -146,7 +146,7 @@
+     esac
+ 
+     # General
+-    H5_CFLAGS="$H5_CFLAGS $arch -ansi -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline"
++    H5_CFLAGS="$H5_CFLAGS $arch -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline"
+ 
+     # Production
+     case "$cc_vendor-$cc_version" in
--- a/src/hdf5.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/hdf5.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -7,7 +7,7 @@
 $(PKG)_CHECKSUM := 867a91b75ee0bbd1f1b13aecd52e883be1507a2c
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := http://www.hdfgroup.org/ftp/HDF5/current/src/$($(PKG)_FILE)
+$(PKG)_URL      := http://www.hdfgroup.org/ftp/HDF5/releases/$(PKG)-$($(PKG)_VERSION)/src/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 ifeq ($(MXE_SYSTEM),mingw)
   ifneq ($(MXE_NATIVE_BUILD),yes)
@@ -16,14 +16,10 @@
       LIBS=-lws2_32 \
       hdf5_cv_gettimeofday_tz=no \
       hdf5_cv_vsnprintf_works=yes \
-      hdf5_cv_printf_ll=l \
-      hdf5_cv_system_scope_threads=yes \
       hdf5_cv_ldouble_to_integer_works=yes \
       hdf5_cv_ulong_to_float_accurate=yes \
-      hdf5_cv_ulong_to_fp_bottom_bit_accurate=no \
       hdf5_cv_fp_to_ullong_accurate=yes \
       hdf5_cv_fp_to_ullong_right_maximum=no \
-      hdf5_cv_fp_to_ullong_right_maximum=no \
       hdf5_cv_ldouble_to_uint_accurate=yes \
       hdf5_cv_ullong_to_ldouble_precision=yes \
       hdf5_cv_fp_to_integer_overflow_works=yes \
@@ -31,6 +27,23 @@
       hdf5_cv_long_to_ldouble_special=no \
       hdf5_cv_ldouble_to_llong_accurate=yes \
       hdf5_cv_llong_to_ldouble_correct=yes
+    ifeq ($(TARGET),x86_64-w64-mingw32)
+      $(PKG)_CROSS_CONFIG_OPTIONS += \
+        hdf5_cv_printf_ll=ll \
+        hdf5_cv_system_scope_threads=no \
+        hdf5_cv_ldouble_to_integer_accurate=yes \
+        hdf5_cv_ulong_to_fp_bottom_bit_accurate=yes \
+        ac_cv_sizeof_long=4 \
+        ac_cv_sizeof_long_double=16 \
+        ac_cv_sizeof_long_long=8 \
+        ac_cv_sizeof_off_t=8 \
+        ac_cv_sys_file_offset_bits=64
+    else
+      $(PKG)_CROSS_CONFIG_OPTIONS += \
+        hdf5_cv_printf_ll=l \
+        hdf5_cv_system_scope_threads=yes \
+        hdf5_cv_ulong_to_fp_bottom_bit_accurate=no
+    endif
   endif
 endif
 
@@ -44,6 +57,18 @@
 endef
 
 define $(PKG)_BUILD
+    case '$(TARGET)' in \
+      x86_64-w64-mingw32) \
+        cp '$(1)/src/H5Tinit.c.mingw64' '$(1)/src/H5Tinit.c.mingw' \
+      ;; \
+      i686-w64-mingw32) \
+        cp '$(1)/src/H5Tinit.c.mingw32' '$(1)/src/H5Tinit.c.mingw' \
+      ;; \
+      i686-pc-mingw32) \
+        cp '$(1)/src/H5Tinit.c.mingw32' '$(1)/src/H5Tinit.c.mingw' \
+      ;; \
+    esac
+
     # build GCC and support libraries
     cd '$(1)' && autoreconf
     mkdir '$(1)/.build'
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ice.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := ice
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.0.9
+$(PKG)_CHECKSUM := f16102adcfbc11bb78da4aff7a9cb28009828c9f
+$(PKG)_SUBDIR   := libICE-$($(PKG)_VERSION)
+$(PKG)_FILE     := libICE-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
+$(PKG)_DEPS     := xproto xtrans
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/inputproto.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := inputproto
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.3
+$(PKG)_CHECKSUM := 60ee91839805cb13039e2ffba84279c346b9b2ed
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/proto/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/kbproto.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := kbproto
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.0.6
+$(PKG)_CHECKSUM := d2168250175b51cd4d4895541b688ca14ea31d10
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/proto/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- a/src/lapack.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/lapack.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -13,7 +13,7 @@
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
   $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES=$(HOST_BINDIR)/libblas.dll
 else
-  $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES=blas
+  $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES="-L$(HOST_PREFIX)/lib -lblas"
 endif
 
 ifeq ($(ENABLE_64),yes)
--- a/src/libffi.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/libffi.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -12,8 +12,8 @@
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://github.com/atgreen/libffi/tags' | \
-    grep '<a href="/atgreen/libffi/tarball/' | \
-    $(SED) -n 's,.*href="/atgreen/libffi/tarball/v\([0-9][^"]*\)".*,\1,p' | \
+    grep '<a href="/atgreen/libffi/archive/' | \
+    $(SED) -n 's,.*href="/atgreen/libffi/archive/v\([0-9][^"]*\)\.tar.*,\1,p' | \
     head -1
 endef
 
--- a/src/libgcrypt.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/libgcrypt.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := libgcrypt
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.5.3
-$(PKG)_CHECKSUM := 2c6553cc17f2a1616d512d6870fe95edf6b0e26e
+$(PKG)_VERSION  := 1.6.1
+$(PKG)_CHECKSUM := f03d9b63ac3b17a6972fc11150d136925b702f02
 $(PKG)_SUBDIR   := libgcrypt-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgcrypt-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnupg.org/gcrypt/libgcrypt/$($(PKG)_FILE)
--- a/src/libgomp.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/libgomp.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -26,6 +26,7 @@
         --target='$(TARGET)' \
         --prefix='$(HOST_PREFIX)' \
         --enable-version-specific-runtime-libs \
+        --disable-multilib \
         --with-gnu-ld \
         $(ENABLE_SHARED_OR_STATIC) \
         $($(PKG)_SYSDEP_CONFIGURE_OPTIONS)
--- a/src/libmpcdec.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/libmpcdec.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -11,12 +11,8 @@
 $(PKG)_DEPS     := 
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://files.musepack.net/source/$(PKG)-$($(PKG)_VERSION)' | \
-    $(SED) -n 's,.*$(PKG)-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    grep -v 'alpha' | \
-    grep -v 'beta' | \
-    $(SORT) -Vr | \
-    head -1
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
+    echo $($(PKG)_VERSION)
 endef
 
 define $(PKG)_BUILD
--- a/src/libpng.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/libpng.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,12 +3,12 @@
 
 PKG             := libpng
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.6.12
-$(PKG)_CHECKSUM := c3d54f9ab683d63218361487269380fb8e0cf3b6
+$(PKG)_VERSION  := 1.6.15
+$(PKG)_CHECKSUM := bddeac8ca97fbcf54d6d32c6eefed5d94b49df88
 $(PKG)_SUBDIR   := libpng-$($(PKG)_VERSION)
 $(PKG)_FILE     := libpng-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)$(subst .,,$(call SHORT_PKG_VERSION,$(PKG)))/older-releases/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://ftp.simplesystems.org/pub/$(PKG)/png/src/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)$(subst .,,$(call SHORT_PKG_VERSION,$(PKG)))/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL_2    := ftp://ftp.simplesystems.org/pub/$(PKG)/png/src/$(PKG)$(subst .,,$(call SHORT_PKG_VERSION,$(PKG)))/$($(PKG)_FILE)
 $(PKG)_DEPS     := zlib
 
 # Configure script detection of memset and pow doesn't work on MSVC.
--- a/src/libssh2-1-fixes.patch	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/libssh2-1-fixes.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -1,29 +1,6 @@
 This file is part of MXE.
 See index.html for further information.
 
-From 0e2179c67d0cd618be29b30425bda18c23a2ddf0 Mon Sep 17 00:00:00 2001
-From: Dmitry Smirnov <onlyjob@member.fsf.org>
-Date: Mon, 13 Aug 2012 23:34:51 +0200
-Subject: [PATCH 1/2] configure: gcrypt doesn't come with pkg-config support
-
-... so use plain old -lgcrypt to the linker to link with it.
-
-Fixes #225
-(cherry picked from commit e470738a0cf302abfd2891b80dbac4ac3e7eedd2)
-
-diff --git a/configure.ac b/configure.ac
-index aa9d397..dfc6988 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -102,7 +102,7 @@ fi
- # Look for libgcrypt
- if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then
-   AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
--  LIBSREQUIRED=libgcrypt
-+  LIBS="$LIBS -lgcrypt"
- fi
- 
- AC_SUBST(LIBSREQUIRED)
 -- 
 1.7.10.4
 
--- a/src/libssh2.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/libssh2.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := libssh2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.4.2
-$(PKG)_CHECKSUM := 7fc084254dabe14a9bc90fa3d569faa7ee943e19
+$(PKG)_VERSION  := 1.4.3
+$(PKG)_CHECKSUM := c27ca83e1ffeeac03be98b6eef54448701e044b0
 $(PKG)_SUBDIR   := libssh2-$($(PKG)_VERSION)
 $(PKG)_FILE     := libssh2-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.libssh2.org/download/$($(PKG)_FILE)
--- a/src/libxml2.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/libxml2.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := libxml2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.9.1
-$(PKG)_CHECKSUM := eb3e2146c6d68aea5c2a4422ed76fe196f933c21
+$(PKG)_VERSION  := 2.9.2
+$(PKG)_CHECKSUM := f46a37ea6d869f702e03f393c376760f3cbee673
 $(PKG)_SUBDIR   := libxml2-$($(PKG)_VERSION)
 $(PKG)_FILE     := libxml2-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://xmlsoft.org/libxml2/$($(PKG)_FILE)
--- a/src/mingw-hdf5-1.patch	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/mingw-hdf5-1.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -1,6 +1,6 @@
 diff -rNu a/bin/make_lib_settings b/bin/make_lib_settings
 --- a/bin/make_lib_settings	1969-12-31 19:00:00.000000000 -0500
-+++ b/bin/make_lib_settings	2012-12-26 16:20:00.517121947 -0500
++++ b/bin/make_lib_settings	2014-09-01 11:49:54.453674207 -0400
 @@ -0,0 +1,45 @@
 +#!/usr/bin/perl -w
 +require 5.003;
@@ -49,7 +49,7 @@
 +print ";\n"
 diff -rNu a/configure.ac b/configure.ac
 --- a/configure.ac	2012-10-26 20:14:41.000000000 -0400
-+++ b/configure.ac	2012-12-26 16:20:00.517121947 -0500
++++ b/configure.ac	2014-09-01 11:49:54.457674075 -0400
 @@ -1045,7 +1045,7 @@
  ## Create libtool.  If shared/static libraries are going to be enabled
  ## or disabled, it should happen before these macros.
@@ -61,7 +61,7 @@
  ## Check if we should install only statically linked executables.
 diff -rNu a/src/H5Tinit.c.mingw32 b/src/H5Tinit.c.mingw32
 --- a/src/H5Tinit.c.mingw32	1969-12-31 19:00:00.000000000 -0500
-+++ b/src/H5Tinit.c.mingw32	2012-12-26 16:20:00.521121812 -0500
++++ b/src/H5Tinit.c.mingw32	2014-09-01 11:49:54.461673944 -0400
 @@ -0,0 +1,978 @@
 +/* Generated automatically by H5detect -- do not edit */
 +
@@ -1041,9 +1041,993 @@
 +/* signal_handlers tested: 10 times */
 +/* sigbus_handler called: 5 times */
 +/* sigsegv_handler called: 5 times */
+diff -rNu a/src/H5Tinit.c.mingw64 b/src/H5Tinit.c.mingw64
+--- a/src/H5Tinit.c.mingw64	1969-12-31 19:00:00.000000000 -0500
++++ b/src/H5Tinit.c.mingw64	2014-09-01 11:52:24.240756904 -0400
+@@ -0,0 +1,980 @@
++/* Generated automatically by H5detect -- do not edit */
++
++
++
++/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
++ * Copyright by The HDF Group.                                               *
++ * Copyright by the Board of Trustees of the University of Illinois.         *
++ * All rights reserved.                                                      *
++ *                                                                           *
++ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
++ * terms governing use, modification, and redistribution, is contained in    *
++ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
++ * of the source code distribution tree; Copyright.html can be found at the  *
++ * root level of an installed copy of the electronic HDF5 document set and   *
++ * is linked from the top-level documents page.  It can also be found at     *
++ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
++ * access to either file, you may request a copy from help@hdfgroup.org.     *
++ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
++ *
++ * Created:		Aug 31, 2014
++ *			
++ *
++ * Purpose:		This machine-generated source code contains
++ *			information about the various integer and
++ *			floating point numeric formats found on this
++ *			architecture.  The parameters below should be
++ *			checked carefully and errors reported to the
++ *			HDF5 maintainer.
++ *			
++ *			Each of the numeric formats listed below are
++ *			printed from most significant bit to least
++ *			significant bit even though the actual bytes
++ *			might be stored in a different order in
++ *			memory.	 The integers above each binary byte
++ *			indicate the relative order of the bytes in
++ *			memory; little-endian machines have
++ *			decreasing numbers while big-endian machines
++ *			have increasing numbers.
++ *			
++ *			The fields of the numbers are printed as
++ *			letters with `S' for the mantissa sign bit,
++ *			`M' for the mantissa magnitude, and `E' for
++ *			the exponent.  The exponent has an associated
++ *			bias which can be subtracted to find the
++ *			true exponent.	The radix point is assumed
++ *			to be before the first `M' bit.	 Any bit
++ *			of a floating-point value not falling into one
++ *			of these categories is printed as a question
++ *			mark.  Bits of integer types are printed as
++ *			`I' for 2's complement and `U' for magnitude.
++ *			
++ *			If the most significant bit of the normalized
++ *			mantissa (always a `1' except for `0.0') is
++ *			not stored then an `implicit=yes' appears
++ *			under the field description.  In thie case,
++ *			the radix point is still assumed to be
++ *			before the first `M' but after the implicit
++ *			bit.
++ *
++ * Modifications:
++ *
++ *	DO NOT MAKE MODIFICATIONS TO THIS FILE!
++ *	It was generated by code in `H5detect.c'.
++ *
++ *-------------------------------------------------------------------------
++ */
++
++/****************/
++/* Module Setup */
++/****************/
++
++#define H5T_PACKAGE /*suppress error about including H5Tpkg.h*/
++
++
++/***********/
++/* Headers */
++/***********/
++#include "H5private.h"		/* Generic Functions			*/
++#include "H5Eprivate.h"		/* Error handling		  	*/
++#include "H5FLprivate.h"	/* Free Lists				*/
++#include "H5Iprivate.h"		/* IDs			  		*/
++#include "H5Tpkg.h"		/* Datatypes 				*/
++
++
++/****************/
++/* Local Macros */
++/****************/
++
++
++/******************/
++/* Local Typedefs */
++/******************/
++
++
++/********************/
++/* Package Typedefs */
++/********************/
++
++
++/********************/
++/* Local Prototypes */
++/********************/
++
++
++/********************/
++/* Public Variables */
++/********************/
++
++
++/*****************************/
++/* Library Private Variables */
++/*****************************/
++
++
++/*********************/
++/* Package Variables */
++/*********************/
++
++
++
++/*******************/
++/* Local Variables */
++/*******************/
++
++
++
++/*-------------------------------------------------------------------------
++ * Function:	H5TN_init_interface
++ *
++ * Purpose:	Initialize pre-defined native datatypes from code generated
++ *              during the library configuration by H5detect.
++ *
++ * Return:	Success:	non-negative
++ *		Failure:	negative
++ *
++ * Programmer:	Robb Matzke
++ *              Wednesday, December 16, 1998
++ *
++ *-------------------------------------------------------------------------
++ */
++herr_t
++H5TN_init_interface(void)
++{
++    H5T_t	*dt = NULL;
++    herr_t	ret_value = SUCCEED;
++
++    FUNC_ENTER_NOAPI(FAIL)
++
++   /*
++    *    0
++    * IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 1;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 8;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_SCHAR_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_SCHAR_ALIGN_g = 1;
++    H5T_NATIVE_SCHAR_COMP_ALIGN_g = 1;
++
++   /*
++    *    0
++    * UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 1;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 8;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_UCHAR_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_UCHAR_ALIGN_g = 1;
++
++   /*
++    *    1        0
++    * IIIIIIII IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 2;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 16;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_SHORT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_SHORT_ALIGN_g = 1;
++    H5T_NATIVE_SHORT_COMP_ALIGN_g = 2;
++
++   /*
++    *    1        0
++    * UUUUUUUU UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 2;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 16;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_USHORT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_USHORT_ALIGN_g = 1;
++
++   /*
++    *    3        2        1        0
++    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 4;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 32;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_INT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_INT_ALIGN_g = 1;
++    H5T_NATIVE_INT_COMP_ALIGN_g = 4;
++
++   /*
++    *    3        2        1        0
++    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 4;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 32;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_UINT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_UINT_ALIGN_g = 1;
++
++   /*
++    *    3        2        1        0
++    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 4;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 32;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_LONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_LONG_ALIGN_g = 1;
++    H5T_NATIVE_LONG_COMP_ALIGN_g = 4;
++
++   /*
++    *    3        2        1        0
++    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 4;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 32;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_ULONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_ULONG_ALIGN_g = 1;
++
++   /*
++    *    0
++    * IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 1;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 8;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_INT8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_INT8_ALIGN_g = 1;
++
++   /*
++    *    0
++    * UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 1;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 8;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_UINT8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_UINT8_ALIGN_g = 1;
++
++   /*
++    *    0
++    * IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 1;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 8;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_INT_LEAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_INT_LEAST8_ALIGN_g = 1;
++
++   /*
++    *    0
++    * UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 1;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 8;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_UINT_LEAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_UINT_LEAST8_ALIGN_g = 1;
++
++   /*
++    *    0
++    * IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 1;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 8;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_INT_FAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_INT_FAST8_ALIGN_g = 1;
++
++   /*
++    *    0
++    * UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 1;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 8;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_UINT_FAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_UINT_FAST8_ALIGN_g = 1;
++
++   /*
++    *    1        0
++    * IIIIIIII IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 2;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 16;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_INT16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_INT16_ALIGN_g = 1;
++
++   /*
++    *    1        0
++    * UUUUUUUU UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 2;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 16;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_UINT16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_UINT16_ALIGN_g = 1;
++
++   /*
++    *    1        0
++    * IIIIIIII IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 2;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 16;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_INT_LEAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_INT_LEAST16_ALIGN_g = 1;
++
++   /*
++    *    1        0
++    * UUUUUUUU UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 2;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 16;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_UINT_LEAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_UINT_LEAST16_ALIGN_g = 1;
++
++   /*
++    *    1        0
++    * IIIIIIII IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 2;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 16;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_INT_FAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_INT_FAST16_ALIGN_g = 1;
++
++   /*
++    *    1        0
++    * UUUUUUUU UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 2;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 16;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_UINT_FAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_UINT_FAST16_ALIGN_g = 1;
++
++   /*
++    *    3        2        1        0
++    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 4;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 32;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_INT32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_INT32_ALIGN_g = 1;
++
++   /*
++    *    3        2        1        0
++    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 4;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 32;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_UINT32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_UINT32_ALIGN_g = 1;
++
++   /*
++    *    3        2        1        0
++    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 4;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 32;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_INT_LEAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_INT_LEAST32_ALIGN_g = 1;
++
++   /*
++    *    3        2        1        0
++    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 4;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 32;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_UINT_LEAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_UINT_LEAST32_ALIGN_g = 1;
++
++   /*
++    *    3        2        1        0
++    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 4;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 32;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_INT_FAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_INT_FAST32_ALIGN_g = 1;
++
++   /*
++    *    3        2        1        0
++    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 4;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 32;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_UINT_FAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_UINT_FAST32_ALIGN_g = 1;
++
++   /*
++    *    7        6        5        4
++    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
++    *    3        2        1        0
++    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 8;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 64;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_INT64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_INT64_ALIGN_g = 1;
++
++   /*
++    *    7        6        5        4
++    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
++    *    3        2        1        0
++    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 8;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 64;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_UINT64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_UINT64_ALIGN_g = 1;
++
++   /*
++    *    7        6        5        4
++    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
++    *    3        2        1        0
++    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 8;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 64;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_INT_LEAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_INT_LEAST64_ALIGN_g = 1;
++
++   /*
++    *    7        6        5        4
++    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
++    *    3        2        1        0
++    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 8;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 64;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_UINT_LEAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_UINT_LEAST64_ALIGN_g = 1;
++
++   /*
++    *    7        6        5        4
++    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
++    *    3        2        1        0
++    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 8;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 64;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_INT_FAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_INT_FAST64_ALIGN_g = 1;
++
++   /*
++    *    7        6        5        4
++    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
++    *    3        2        1        0
++    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 8;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 64;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_UINT_FAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_UINT_FAST64_ALIGN_g = 1;
++
++   /*
++    *    7        6        5        4
++    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
++    *    3        2        1        0
++    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 8;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 64;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
++    if((H5T_NATIVE_LLONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_LLONG_ALIGN_g = 1;
++    H5T_NATIVE_LLONG_COMP_ALIGN_g = 8;
++
++   /*
++    *    7        6        5        4
++    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
++    *    3        2        1        0
++    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_INTEGER;
++    dt->shared->size = 8;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 64;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
++    if((H5T_NATIVE_ULLONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_ULLONG_ALIGN_g = 1;
++
++   /*
++    *    3        2        1        0
++    * SEEEEEEE EMMMMMMM MMMMMMMM MMMMMMMM
++    * Implicit bit? yes
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_FLOAT;
++    dt->shared->size = 4;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 32;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.f.sign = 31;
++    dt->shared->u.atomic.u.f.epos = 23;
++    dt->shared->u.atomic.u.f.esize = 8;
++    dt->shared->u.atomic.u.f.ebias = 0x0000007f;
++    dt->shared->u.atomic.u.f.mpos = 0;
++    dt->shared->u.atomic.u.f.msize = 23;
++    dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED;
++    dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO;
++    if((H5T_NATIVE_FLOAT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_FLOAT_ALIGN_g = 1;
++    H5T_NATIVE_FLOAT_COMP_ALIGN_g = 4;
++
++   /*
++    *    7        6        5        4
++    * SEEEEEEE EEEEMMMM MMMMMMMM MMMMMMMM
++    *    3        2        1        0
++    * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM
++    * Implicit bit? yes
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_FLOAT;
++    dt->shared->size = 8;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 64;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.f.sign = 63;
++    dt->shared->u.atomic.u.f.epos = 52;
++    dt->shared->u.atomic.u.f.esize = 11;
++    dt->shared->u.atomic.u.f.ebias = 0x000003ff;
++    dt->shared->u.atomic.u.f.mpos = 0;
++    dt->shared->u.atomic.u.f.msize = 52;
++    dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED;
++    dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO;
++    if((H5T_NATIVE_DOUBLE_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_DOUBLE_ALIGN_g = 1;
++    H5T_NATIVE_DOUBLE_COMP_ALIGN_g = 8;
++
++   /*
++    *   15       14       13       12
++    * ???????? ???????? ???????? ????????
++    *   11       10        9        8
++    * ???????? ???????? SEEEEEEE EEEEEEEE
++    *    7        6        5        4
++    * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM
++    *    3        2        1        0
++    * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM
++    * Implicit bit? no
++    * Alignment: none
++    */
++    if(NULL == (dt = H5T__alloc()))
++        HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
++    dt->shared->state = H5T_STATE_IMMUTABLE;
++    dt->shared->type = H5T_FLOAT;
++    dt->shared->size = 16;
++    dt->shared->u.atomic.order = H5T_ORDER_LE;
++    dt->shared->u.atomic.offset = 0;
++    dt->shared->u.atomic.prec = 80;
++    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
++    dt->shared->u.atomic.u.f.sign = 79;
++    dt->shared->u.atomic.u.f.epos = 64;
++    dt->shared->u.atomic.u.f.esize = 15;
++    dt->shared->u.atomic.u.f.ebias = 0x00003fff;
++    dt->shared->u.atomic.u.f.mpos = 0;
++    dt->shared->u.atomic.u.f.msize = 64;
++    dt->shared->u.atomic.u.f.norm = H5T_NORM_NONE;
++    dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO;
++    if((H5T_NATIVE_LDOUBLE_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
++        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
++    H5T_NATIVE_LDOUBLE_ALIGN_g = 1;
++    H5T_NATIVE_LDOUBLE_COMP_ALIGN_g = 16;
++
++    /* Set the native order for this machine */
++    H5T_native_order_g = H5T_ORDER_LE;
++
++    /* Structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */
++    H5T_POINTER_COMP_ALIGN_g = 8;
++    H5T_HVL_COMP_ALIGN_g = 8;
++    H5T_HOBJREF_COMP_ALIGN_g = 8;
++    H5T_HDSETREGREF_COMP_ALIGN_g = 1;
++
++done:
++    if(ret_value < 0) {
++        if(dt != NULL) {
++            dt->shared = H5FL_FREE(H5T_shared_t, dt->shared);
++            dt = H5FL_FREE(H5T_t, dt);
++        } /* end if */
++    } /* end if */
++
++    FUNC_LEAVE_NOAPI(ret_value);
++} /* end H5TN_init_interface() */
++
++/****************************************/
++/* ALIGNMENT and signal-handling status */
++/****************************************/
++/* Signal() support: yes */
++/* setjmp() support: yes */
++/* longjmp() support: yes */
++/* sigsetjmp() support: no */
++/* siglongjmp() support: no */
++/* sigprocmask() support: no */
++
++/******************************/
++/* signal handlers statistics */
++/******************************/
++/* signal_handlers tested: 10 times */
++/* sigbus_handler called: 5 times */
++/* sigsegv_handler called: 5 times */
 diff -rNu a/src/Makefile.am b/src/Makefile.am
 --- a/src/Makefile.am	2012-10-11 13:30:56.000000000 -0400
-+++ b/src/Makefile.am	2012-12-26 16:29:28.153764421 -0500
++++ b/src/Makefile.am	2014-09-01 11:57:11.711319644 -0400
 @@ -22,18 +22,11 @@
  include $(top_srcdir)/config/lt_vers.am
  
@@ -1077,8 +2061,8 @@
 -	$(RUNSERIAL) ./H5detect$(EXEEXT) > $@  ||                               \
 -	    (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||          \
 -	    ($(RM) $@ ; exit 1)
-+H5Tinit.c: H5Tinit.c.mingw32
-+	cp $(srcdir)/H5Tinit.c.mingw32 $@
++H5Tinit.c: H5Tinit.c.mingw
++	cp $(srcdir)/H5Tinit.c.mingw $@
  
  # Build configuration header file generation
  # The LD_LIBRARY_PATH setting is a kludge.
--- a/src/mingw-libgcrypt-1-fixes.patch	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/mingw-libgcrypt-1-fixes.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -1,35 +1,23 @@
-diff -ur libgcrypt-1.5.3.orig/random/rndw32.c libgcrypt-1.5.3/random/rndw32.c
---- libgcrypt-1.5.3.orig/random/rndw32.c	2013-10-18 11:40:06 -0400
-+++ libgcrypt-1.5.3/random/rndw32.c	2013-10-18 11:42:15 -0400
-@@ -78,7 +78,9 @@
- #include <stdint.h>
- #endif
- 
-+#define WIN32_LEAN_AND_MEAN
- #include <windows.h>
-+#include <winperf.h>
- 
- 
- #include "types.h"
-diff -ur libgcrypt-1.5.3.orig/src/ath.h libgcrypt-1.5.3/src/ath.h
---- libgcrypt-1.5.3.orig/src/ath.h	2013-10-18 11:40:06 -0400
-+++ libgcrypt-1.5.3/src/ath.h	2013-10-18 11:40:33 -0400
-@@ -24,6 +24,7 @@
- #include <config.h>
- 
- #ifdef _WIN32
-+# define WIN32_LEAN_AND_MEAN
- # include <windows.h>
- #else /* !_WIN32 */
- # ifdef HAVE_SYS_SELECT_H
-diff -ur libgcrypt-1.5.3.orig/tests/benchmark.c libgcrypt-1.5.3/tests/benchmark.c
---- libgcrypt-1.5.3.orig/tests/benchmark.c	2013-10-18 11:40:07 -0400
-+++ libgcrypt-1.5.3/tests/benchmark.c	2013-10-18 11:40:33 -0400
-@@ -25,6 +25,7 @@
- #include <time.h>
- #include <stdarg.h>
- #ifdef _WIN32
-+#define WIN32_LEAN_AND_MEAN
- #include <windows.h>
- #else
- #include <sys/times.h>
+From http://lists.freedesktop.org/archives/gstreamer-commits/2014-February/077094.html
+
+diff -ur libgcrypt-1.6.1.orig/random/rndhw.c libgcrypt-1.6.1/random/rndhw.c
+--- libgcrypt-1.6.1.orig/random/rndhw.c	2014-08-16 22:16:09.991066266 -0400
++++ libgcrypt-1.6.1/random/rndhw.c	2014-08-16 22:19:19.025936274 -0400
+@@ -69,7 +69,7 @@
+   nbytes = 0;
+   while (nbytes < 64)
+     {
+-#if defined(__x86_64__) && defined(__LP64__)
++#if defined(__x86_64__) // && defined(__LP64__)
+       asm volatile
+         ("movq %1, %%rdi\n\t"         /* Set buffer.  */
+          "xorq %%rdx, %%rdx\n\t"      /* Request up to 8 bytes.  */
+@@ -123,7 +123,7 @@
+ #ifdef USE_DRNG
+ # define RDRAND_RETRY_LOOPS	10
+ # define RDRAND_INT	".byte 0x0f,0xc7,0xf0"
+-# if defined(__x86_64__) && defined(__LP64__)
++# if defined(__x86_64__) //&& defined(__LP64__)
+ #  define RDRAND_LONG	".byte 0x48,0x0f,0xc7,0xf0"
+ # else
+ #  define RDRAND_LONG	RDRAND_INT
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mingw-w64-1-float-h.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,25 @@
+This file is part of MXE.
+See index.html for further information.
+
+workaround for -isystem flag messing up include order
+https://bugzilla.redhat.com/show_bug.cgi?id=843436
+
+diff -ur a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
+--- a/mingw-w64-headers/crt/float.h	2014-01-11 21:38:50.640418500 +1100
++++ b/mingw-w64-headers/crt/float.h	2014-01-11 21:44:08.528393903 +1100
+@@ -105,6 +105,15 @@
+ 	#define DBL_MAX_10_EXP	__DBL_MAX_10_EXP__
+ 	#define LDBL_MAX_10_EXP	__LDBL_MAX_10_EXP__
+ 
++    /* The difference between 1 and the least value greater than 1 that is
++    representable in the given floating point type, b**1-p.  */
++    #undef FLT_EPSILON
++    #undef DBL_EPSILON
++    #undef LDBL_EPSILON
++    #define FLT_EPSILON __FLT_EPSILON__
++    #define DBL_EPSILON __DBL_EPSILON__
++    #define LDBL_EPSILON    __LDBL_EPSILON__
++
+ 	/* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown.  */
+ 	/* ??? This is supposed to change with calls to fesetround in <fenv.h>.  */
+ 	#undef FLT_ROUNDS
--- a/src/mingw-w64-1-math-h.patch	Wed Jul 09 09:25:57 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch was taken from:
-https://sourceforge.net/p/mingw-w64/code/6479/
-
---- a/mingw-w64-headers/crt/math.h
-+++ b/mingw-w64-headers/crt/math.h
-@@ -36,7 +36,7 @@
- #endif
- #endif
- 
--#ifndef __STRICT_ANSI__
-+#if !defined(__STRICT_ANSI__) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) 
- #define M_E		2.7182818284590452354
- #define M_LOG2E		1.4426950408889634074
- #define M_LOG10E	0.43429448190325182765
-
--- a/src/mingw-w64-2-float-h.patch	Wed Jul 09 09:25:57 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-workaround for -isystem flag messing up include order
-https://bugzilla.redhat.com/show_bug.cgi?id=843436
-
-diff -ur a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
---- a/mingw-w64-headers/crt/float.h	2014-01-11 21:38:50.640418500 +1100
-+++ b/mingw-w64-headers/crt/float.h	2014-01-11 21:44:08.528393903 +1100
-@@ -105,6 +105,15 @@
- 	#define DBL_MAX_10_EXP	__DBL_MAX_10_EXP__
- 	#define LDBL_MAX_10_EXP	__LDBL_MAX_10_EXP__
- 
-+    /* The difference between 1 and the least value greater than 1 that is
-+    representable in the given floating point type, b**1-p.  */
-+    #undef FLT_EPSILON
-+    #undef DBL_EPSILON
-+    #undef LDBL_EPSILON
-+    #define FLT_EPSILON __FLT_EPSILON__
-+    #define DBL_EPSILON __DBL_EPSILON__
-+    #define LDBL_EPSILON    __LDBL_EPSILON__
-+
- 	/* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown.  */
- 	/* ??? This is supposed to change with calls to fesetround in <fenv.h>.  */
- 	#undef FLT_ROUNDS
--- a/src/mingw-w64.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/mingw-w64.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := mingw-w64
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.1.0
-$(PKG)_CHECKSUM := c167b1dc114a13c465fe6adcce9dc65c509baf75
+$(PKG)_VERSION  := 3.3.0
+$(PKG)_CHECKSUM := d31eac960d42e791970697eae5724e529c81dcd6
 $(PKG)_SUBDIR   := $(PKG)-v$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-v$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE)
--- a/src/msys-bash.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/msys-bash.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -12,8 +12,9 @@
 $(PKG)_DEPS     := 
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
-    echo $($(PKG)_VERSION)
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/bash' | \
+    $(SED) -n 's,.*title="bash-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
--- a/src/msys-libintl.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/msys-libintl.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -12,8 +12,9 @@
 $(PKG)_DEPS     := 
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
-    echo $($(PKG)_VERSION)
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/gettext' | \
+    $(SED) -n 's,.*title="gettext-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
--- a/src/msys-libmagic.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/msys-libmagic.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -12,8 +12,9 @@
 $(PKG)_DEPS     := 
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
-    echo $($(PKG)_VERSION)
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/file' | \
+    $(SED) -n 's,.*title="file-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
--- a/src/msys-msys-core.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/msys-msys-core.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -12,8 +12,9 @@
 $(PKG)_DEPS     := 
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
-    echo $($(PKG)_VERSION)
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/msys-core' | \
+    $(SED) -n 's,.*title="msys-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
--- a/src/mxml.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/mxml.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -11,9 +11,8 @@
 $(PKG)_DEPS     := pthreads
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://www.msweet.org/downloads.php?L+Z3' | \
-    $(SED) -n 's,.*<a href="files.*mxml-\([0-9\.]*\)\.tar.*,\1,p' | \
-    head -1
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
+    echo $($(PKG)_VERSION)
 endef
 
 define $(PKG)_BUILD
--- a/src/native-gcc-2-intrinsics.patch	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/native-gcc-2-intrinsics.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -55,7 +55,7 @@
  #undef __DISABLE_SSE4A__
  #pragma GCC pop_options
 diff --git a/gcc/config/i386/avx2intrin.h b/gcc/config/i386/avx2intrin.h
-index d04c972..9302273 100644
+index d04c972..2c0d6e7 100644
 --- a/gcc/config/i386/avx2intrin.h
 +++ b/gcc/config/i386/avx2intrin.h
 @@ -34,6 +34,10 @@
@@ -69,17 +69,17 @@
  /* Sum absolute 8-bit integer difference of adjacent groups of 4
     byte integers in the first 2 operands.  Starting offsets within
     operands are determined by the 3rd mask operand.  */
-@@ -1887,3 +1891,8 @@ _mm256_mask_i64gather_epi32 (__m128i src, int const *base,
+@@ -1886,4 +1890,8 @@ _mm256_mask_i64gather_epi32 (__m128i src, int const *base,
+ #pragma GCC pop_options
  #endif /* __DISABLE_AVX2__ */
  
- #endif /* _AVX2INTRIN_H_INCLUDED */
-+
 +#ifdef __cplusplus
 +}
 +#endif
 +
+ #endif /* _AVX2INTRIN_H_INCLUDED */
 diff --git a/gcc/config/i386/avxintrin.h b/gcc/config/i386/avxintrin.h
-index 2ea327c..32591da 100644
+index 2ea327c..f61d850 100644
 --- a/gcc/config/i386/avxintrin.h
 +++ b/gcc/config/i386/avxintrin.h
 @@ -37,6 +37,10 @@
@@ -93,15 +93,15 @@
  /* Internal data types for implementing the intrinsics.  */
  typedef double __v4df __attribute__ ((__vector_size__ (32)));
  typedef float __v8sf __attribute__ ((__vector_size__ (32)));
-@@ -1461,3 +1465,8 @@ _mm256_castsi128_si256 (__m128i __A)
+@@ -1460,4 +1464,8 @@ _mm256_castsi128_si256 (__m128i __A)
+ #pragma GCC pop_options
  #endif /* __DISABLE_AVX__ */
  
- #endif /* _AVXINTRIN_H_INCLUDED */
-+
 +#ifdef __cplusplus
 +}
 +#endif
 +
+ #endif /* _AVXINTRIN_H_INCLUDED */
 diff --git a/gcc/config/i386/bmi2intrin.h b/gcc/config/i386/bmi2intrin.h
 index ff96296..b01e1e1 100644
 --- a/gcc/config/i386/bmi2intrin.h
@@ -325,7 +325,7 @@
 +
  #endif /* _MM_MALLOC_H_INCLUDED */
 diff --git a/gcc/config/i386/ia32intrin.h b/gcc/config/i386/ia32intrin.h
-index 5e7c893..a7fa538 100644
+index 614b0fa..d8e474e 100644
 --- a/gcc/config/i386/ia32intrin.h
 +++ b/gcc/config/i386/ia32intrin.h
 @@ -25,6 +25,10 @@
@@ -339,7 +339,7 @@
  /* 32bit bsf */
  extern __inline int
  __attribute__((__gnu_inline__, __always_inline__, __artificial__))
-@@ -291,3 +295,7 @@ __writeeflags (unsigned int X)
+@@ -297,3 +301,7 @@ __writeeflags (unsigned int X)
  #define _rotwr(a,b)		__rorw((a), (b))
  #define _rotl(a,b)		__rold((a), (b))
  #define _rotr(a,b)		__rord((a), (b))
@@ -616,7 +616,7 @@
 +
  #endif /* _RTMINTRIN_H_INCLUDED */
 diff --git a/gcc/config/i386/smmintrin.h b/gcc/config/i386/smmintrin.h
-index 886ace4..168b903 100644
+index 886ace4..0922b45 100644
 --- a/gcc/config/i386/smmintrin.h
 +++ b/gcc/config/i386/smmintrin.h
 @@ -37,6 +37,10 @@
@@ -630,18 +630,17 @@
  /* Rounding mode macros. */
  #define _MM_FROUND_TO_NEAREST_INT	0x00
  #define _MM_FROUND_TO_NEG_INF		0x01
-@@ -820,6 +824,11 @@ _mm_cmpgt_epi64 (__m128i __X, __m128i __Y)
- #pragma GCC push_options
- #pragma GCC target("sse4.2")
+@@ -822,6 +826,10 @@ _mm_cmpgt_epi64 (__m128i __X, __m128i __Y)
  #define __DISABLE_SSE4_2__
-+
+ #endif /* __SSE4_1__ */
+ 
 +#ifdef __cplusplus
 +}
 +#endif
 +
- #endif /* __SSE4_1__ */
- 
  /* Accumulate CRC32 (polynomial 0x11EDC6F41) value.  */
+ extern __inline unsigned int __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _mm_crc32_u8 (unsigned int __C, unsigned char __V)
 diff --git a/gcc/config/i386/tbmintrin.h b/gcc/config/i386/tbmintrin.h
 index 871f532..744b9ca 100644
 --- a/gcc/config/i386/tbmintrin.h
--- a/src/native-gcc.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/native-gcc.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := native-gcc
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.9.0
-$(PKG)_CHECKSUM := fbde8eb49f2b9e6961a870887cf7337d31cd4917
+$(PKG)_VERSION  := 4.9.2
+$(PKG)_CHECKSUM := 79dbcb09f44232822460d80b033c962c0237c6d8
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -26,7 +26,7 @@
     --disable-win32-registry \
     --with-native-system-header-dir='$(HOST_PREFIX)/include' \
     --enable-threads=win32 
-  ifneq ($(ENABLE_64),yes)
+  ifneq ($(ENABLE_WINDOWS_64),yes)
     $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
       --disable-sjlj-exceptions
   endif
@@ -48,10 +48,10 @@
         --prefix='$(HOST_PREFIX)' \
         --enable-languages='c,c++,fortran' \
         --disable-multilib \
+        --disable-libsanitizer \
         $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-libgomp \
-        --disable-libmudflap \
         --with-cloog='$(HOST_PREFIX)' \
         --with-gmp='$(HOST_PREFIX)' \
         --with-isl='$(HOST_PREFIX)' \
--- a/src/netcdf.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/netcdf.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := netcdf
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.3.0
-$(PKG)_CHECKSUM := 246e4963e66e1c175563cc9a714e9da0a19b8b07
+$(PKG)_VERSION  := 4.3.2
+$(PKG)_CHECKSUM := 6e1bacab02e5220954fe0328d710ebb71c071d19
 $(PKG)_SUBDIR   := netcdf-$($(PKG)_VERSION)
 $(PKG)_FILE     := netcdf-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-$($(PKG)_VERSION).tar.gz
@@ -31,6 +31,7 @@
     fi
     cd '$(1)' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         $($(PKG)_CONFIGURE_OPTIONS) \
--- a/src/nettle.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/nettle.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := nettle
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.7
-$(PKG)_CHECKSUM := e17de3678b987841e88a724b7d2f6856d97ab139
+$(PKG)_VERSION  := 2.7.1
+$(PKG)_CHECKSUM := e7477df5f66e650c4c4738ec8e01c2efdb5d1211
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE)
--- a/src/nsis.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/nsis.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -20,10 +20,10 @@
 define $(PKG)_BUILD
     cd '$(1)' && scons VERBOSE=1 \
         MINGW_CROSS_PREFIX='$(MXE_TOOL_PREFIX)' \
-        PREFIX='$(HOST_PREFIX)' \
+        PREFIX='$(HOST_PREFIX)' PREFIX_BIN=$(BUILD_TOOLS_PREFIX)/bin \
         `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \
         `[ -d /usr/local/lib ]     && echo APPEND_LIBPATH=/usr/local/lib` \
         SKIPUTILS='NSIS Menu' \
         install
-    $(INSTALL) -m755 '$(HOST_BINDIR)/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)makensis'
+    $(INSTALL) -m755 '$(BUILD_TOOLS_PREFIX)/bin/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)makensis'
 endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/octave-1-gnulib-isatty.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,39 @@
+Patch based on savannah.gnu.org/bugs/?327623#attached
+
+diff -ur octave-3.8.2-rc2.orig/libgnu/isatty.c octave-3.8.2-rc2/libgnu/isatty.c
+--- octave-3.8.2-rc2.orig/libgnu/isatty.c	2014-08-12 15:31:01.710229546 -0400
++++ octave-3.8.2-rc2/libgnu/isatty.c	2014-08-12 15:41:15.603406658 -0400
+@@ -34,7 +34,13 @@
+ 
+ /* Optimized test whether a HANDLE refers to a console.
+    See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>.  */
+-#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++//#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++static BOOL
++IsConsoleHandle(HANDLE h)
++{
++  DWORD mode;
++  return GetConsoleMode(h, &mode) != 0;
++}
+ 
+ #if HAVE_MSVC_INVALID_PARAMETER_HANDLER
+ static int
+diff -ur octave-3.8.2-rc2.orig/libgnu/select.c octave-3.8.2-rc2/libgnu/select.c
+--- octave-3.8.2-rc2.orig/libgnu/select.c	2014-08-12 15:31:01.704229427 -0400
++++ octave-3.8.2-rc2/libgnu/select.c	2014-08-12 15:44:44.268552023 -0400
+@@ -84,7 +84,14 @@
+ 
+ /* Optimized test whether a HANDLE refers to a console.
+    See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>.  */
+-#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++//#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++static BOOL
++IsConsoleHandle(HANDLE h)
++{
++  DWORD mode;
++  return GetConsoleMode(h, &mode) != 0;
++}
++
+ 
+ static BOOL
+ IsSocketHandle (HANDLE h)
--- a/src/octave.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/octave.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -11,7 +11,13 @@
 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
   $(PKG)_FONTCONFIG := fontconfig
 endif
-$(PKG)_DEPS     := blas arpack curl fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qhull qrupdate qscintilla qt readline suitesparse texinfo zlib
+$(PKG)_DEPS     := blas arpack curl fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
+ifeq ($(MXE_WINDOWS_BUILD),no)
+  $(PKG)_DEPS += x11 xext
+endif
+ifeq ($(ENABLE_64),no)
+  $(PKG)_DEPS += qhull
+endif
 ifeq ($(ENABLE_JIT),yes)
   $(PKG)_DEPS += llvm
   $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit
@@ -37,7 +43,7 @@
 ifeq ($(MXE_NATIVE_BUILD),yes)
   $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
   ifeq ($(ENABLE_64),yes)
-    $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8
+    $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull F77_INTEGER_8_FLAG=-fdefault-integer-8
   endif
 else
   ifeq ($(MXE_SYSTEM),mingw)
@@ -45,7 +51,7 @@
       FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
       gl_cv_func_gettimeofday_clobber=no
     ifeq ($(ENABLE_64),yes)
-      $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes
+      $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes
     endif
   endif
 endif
--- a/src/of-control.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/of-control.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := of-control
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.6.5
-$(PKG)_CHECKSUM := aff91820615228229006e9a2be28e6e6834f7e12
+$(PKG)_VERSION  := 2.6.6
+$(PKG)_CHECKSUM := 540811b8b749fed24ff8ff752b77b8fa941de56e
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := control
 $(PKG)_FILE     := control-$($(PKG)_VERSION).tar.gz
--- a/src/of-image.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/of-image.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := of-image
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.2.1
-$(PKG)_CHECKSUM := b3d543e8c78a7dc7451a1e6a7a89e6589a0dd04c
+$(PKG)_VERSION  := 2.2.2
+$(PKG)_CHECKSUM := ed119962e8bfc765f786758b082f070d50959107
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := image
 $(PKG)_FILE     := image-$($(PKG)_VERSION).tar.gz
--- a/src/of-io.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/of-io.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := of-io
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.2.2
-$(PKG)_CHECKSUM := 6d9be1f1bef9d2be0c43b2090979e6fbd0d78d88
+$(PKG)_VERSION  := 2.2.5
+$(PKG)_CHECKSUM := a70cf23cfb1a5fada8dff7130b5bb2f5bab4cf64
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := io
 $(PKG)_FILE     := io-$($(PKG)_VERSION).tar.gz
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-ltfat-1-mingw-fixes.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,50 @@
+diff -ur ltfat.orig/src/Makefile.in ltfat/src/Makefile.in
+--- ltfat.orig/src/Makefile.in	2014-11-13 07:55:44 -0500
++++ ltfat/src/Makefile.in	2014-11-13 15:31:03 -0500
+@@ -1,5 +1,11 @@
+ targets = oct playrec
+ 
++CC=@CC@
++CXX=@CXX@
++
++export CC
++export CXX
++
+ ifeq (@have_libportaudio@,1)
+   export HAVE_PORTAUDIO=1
+ endif
+diff -ur ltfat.orig/src/Makefile_unix ltfat/src/Makefile_unix
+--- ltfat.orig/src/Makefile_unix	2014-11-13 07:55:44 -0500
++++ ltfat/src/Makefile_unix	2014-11-21 08:31:02 -0500
+@@ -21,8 +21,11 @@
+    SFFTW=-lfftw3f
+ endif
+ 
+-
+-CFLAGS=-O3 -fPIC -std=c99 -Ithirdparty 
++ifeq ($(OS),Windows_NT)
++   CFLAGS=-O3 -std=c99 -Ithirdparty 
++else
++   CFLAGS=-O3 -fPIC -std=c99 -Ithirdparty 
++endif
+ SHARED_FLAGS=-shared -Wl,--no-undefined -lc -lm -L"$(MATLABROOT)/bin/$(ARCH)" \
+ 			 -lmwblas -lmwlapack $(DFFTW) $(SFFTW)
+ 
+diff -ur ltfat.orig/src/ostools.mk ltfat/src/ostools.mk
+--- ltfat.orig/src/ostools.mk	2014-11-13 07:55:44 -0500
++++ ltfat/src/ostools.mk	2014-11-13 15:28:55 -0500
+@@ -9,12 +9,14 @@
+ CP = copy /Y
+ PS2 = \\
+ PS = $(strip $(PS2))
++ifndef SHELL
+ ifdef ComSpec
+ SHELL := $(ComSpec)
+ endif
+ ifdef COMSPEC
+ SHELL := $(COMSPEC)
+ endif
++endif
+ CC = gcc
+ else
+ #If not on Windows
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-ltfat.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,22 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := of-ltfat
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.0.1
+$(PKG)_CHECKSUM := 5c1d4ee5b3a9e478ef8a5ecb3a2ae1bd84f6fd61
+$(PKG)_REMOTE_SUBDIR :=
+$(PKG)_SUBDIR   := ltfat
+$(PKG)_FILE     := ltfat-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
+$(PKG)_DEPS     := portaudio
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'http://$(SOURCEFORGE_MIRROR)/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/' | \
+    $(SED) -n 's,.*title="ltfat-\([0-9][^"]*\).tar.gz".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    $(OCTAVE_FORGE_PKG_BUILD)
+endef
--- a/src/of-optim.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/of-optim.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := of-optim
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.1
-$(PKG)_CHECKSUM := 172f9d4c08dfccc46b8da4395c95efd87117cd83
+$(PKG)_VERSION  := 1.4.0
+$(PKG)_CHECKSUM := d60e6ae879afa5c8542571667d017fef7161d119
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := optim-$($(PKG)_VERSION)
 $(PKG)_FILE     := optim-$($(PKG)_VERSION).tar.gz
--- a/src/of-quaternion.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/of-quaternion.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := of-quaternion
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.2.1
-$(PKG)_CHECKSUM := 781421949183bb37798d57b070cefddf468debf7
+$(PKG)_VERSION  := 2.2.2
+$(PKG)_CHECKSUM := 5fb44e4f2ff5fb7d6dd14e949fc2a909f084be67
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := quaternion
 $(PKG)_FILE     := quaternion-$($(PKG)_VERSION).tar.gz
--- a/src/openblas.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/openblas.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := openblas
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.2.8
-$(PKG)_CHECKSUM := d012ebc2b8dcd3e95f667dff08318a81479a47c3
+$(PKG)_VERSION  := 0.2.12
+$(PKG)_CHECKSUM := 2bdedca65e29186d1ecaaed45cb6c9b1f3f1c868
 $(PKG)_SUBDIR   := OpenBLAS-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := http://github.com/xianyi/OpenBLAS/archive/v$($(PKG)_VERSION).tar.gz
@@ -27,9 +27,5 @@
 
 define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j '$(JOBS)' $($(PKG)_MAKE_OPTS)  
-    $(MAKE) -C '$(1)' -j 1 PREFIX='$(HOST_PREFIX)' $($(PKG)_MAKE_OPTS) install
-    if [ $(MXE_WINDOWS_BUILD) = yes ] && [ $(BUILD_SHARED) = yes ]; then \
-      $(INSTALL) -d $(HOST_BINDIR); \
-      $(INSTALL) $(HOST_LIBDIR)/libopenblas.dll $(HOST_BINDIR)/; \
-    fi
+    $(MAKE) -C '$(1)' -j 1 $($(PKG)_MAKE_OPTS) install
 endef
--- a/src/postgresql-1-fixes.patch	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/postgresql-1-fixes.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -84,7 +84,7 @@
 -install-lib-shared: $(shlib) installdirs-lib
 +install-lib-shared: $(shlib)
 +ifeq (, $(filter $(PORTNAME), win32 cygwin))
-+install-lib-shared: installdirs-lib
++install-lib-shared: $(shlib) installdirs-lib
 +endif # not win32 or cygwin
  ifdef soname
  # we don't install $(shlib) on AIX
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pstoedit-3-nosecapi.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,28 @@
+diff -ur pstoedit-3.62.orig/src/cppcomp.h pstoedit-3.62/src/cppcomp.h
+--- pstoedit-3.62.orig/src/cppcomp.h	2014-07-25 09:09:48 -0400
++++ pstoedit-3.62/src/cppcomp.h	2014-07-25 09:12:17 -0400
+@@ -33,7 +33,12 @@
+ # define DLLEXPORT
+ #endif
+ 
+-
++#ifdef __MINGW32__
++  #include <_mingw.h>
++  #ifdef MINGW_HAS_SECURE_API
++    #undef MINGW_HAS_SECURE_API
++  #endif
++#endif
+ 
+ 
+ #ifdef _AIX
+diff -ur pstoedit-3.62.orig/src/lexyy.cpp pstoedit-3.62/src/lexyy.cpp
+--- pstoedit-3.62.orig/src/lexyy.cpp	2014-07-25 09:19:14 -0400
++++ pstoedit-3.62/src/lexyy.cpp	2014-07-25 09:20:00 -0400
+@@ -14,6 +14,7 @@
+ #endif
+ 
+ /* First, we deal with  platform-specific or compiler-specific issues. */
++#include "cppcomp.h"
+ 
+ /* begin standard C headers. */
+ #include <stdio.h>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pthread-stubs.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := pthread-stubs
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.3
+$(PKG)_CHECKSUM := 7174d6a5f4b158746f020b8fc7a3e3e5438dd233
+$(PKG)_SUBDIR   := libpthread-stubs-$($(PKG)_VERSION)
+$(PKG)_FILE     := libpthread-stubs-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xcb.freedesktop.org/dist/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/qscintilla-1-transpose-fix.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,12 @@
+diff -ur QScintilla-gpl-2.8.3.orig/lexers/LexMatlab.cpp QScintilla-gpl-2.8.3/lexers/LexMatlab.cpp
+--- QScintilla-gpl-2.8.3.orig/lexers/LexMatlab.cpp	2014-08-01 07:57:01.175910086 -0400
++++ QScintilla-gpl-2.8.3/lexers/LexMatlab.cpp	2014-08-01 08:01:05.815912051 -0400
+@@ -213,7 +213,7 @@
+ 			} else if (isalpha(sc.ch)) {
+ 				sc.SetState(SCE_MATLAB_KEYWORD);
+ 			} else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '@' || sc.ch == '\\') {
+-				if (sc.ch == ')' || sc.ch == ']') {
++				if (sc.ch == ')' || sc.ch == ']' || sc.ch == '}') {
+ 					transpose = true;
+ 				} else {
+ 					transpose = false;
--- a/src/qscintilla.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/qscintilla.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := qscintilla
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.8.3
-$(PKG)_CHECKSUM := d3b4f0dc7358591c122518d932f797ae3e3dd9d4
+$(PKG)_VERSION  := 2.8.4
+$(PKG)_CHECKSUM := 7e15c261a7c1842f3a75e4878a880ab667224494
 $(PKG)_SUBDIR   := QScintilla-gpl-$($(PKG)_VERSION)
 $(PKG)_FILE     := QScintilla-gpl-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -17,8 +17,10 @@
 endif
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package qscintilla.' >&2;
-    echo $(qscintilla_VERSION)
+    $(WGET) -q -O- 'http://www.riverbankcomputing.com/software/qscintilla/download' | \
+        grep QScintilla-gpl | \
+        head -n 1 | \
+        $(SED) -n 's,.*QScintilla-gpl-\([0-9][^>]*\)\.zip.*,\1,p'
 endef
 
 ifneq ($(MXE_NATIVE_BUILD),yes)
@@ -32,7 +34,7 @@
 endif
 
 define $(PKG)_BUILD
-    cd '$(1)/Qt4Qt5' && '$(HOST_BINDIR)/qmake' -makefile $($(PKG)_QMAKE_SPEC_OPTION)
+    cd '$(1)/Qt4Qt5' && '$(MXE_QMAKE)' -makefile $($(PKG)_QMAKE_SPEC_OPTION) QMAKE_UIC=$(MXE_UIC) QMAKE_MOC=$(MXE_MOC)
 
     if [ $(MXE_SYSTEM) = msvc ]; then \
         mkdir -p '$(3)' && \
--- a/src/qt.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/qt.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -9,6 +9,9 @@
 $(PKG)_FILE     := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://download.qt-project.org/archives/qt/4.8/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus fontconfig
+ifeq ($(MXE_WINDOWS_BUILD),no)
+  $(PKG)_DEPS += x11 xext xfixes xdmcp xrender xfixes xdamage xt xxf86vm
+endif
 
 $(PKG)_CONFIGURE_CMD :=
 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION :=
@@ -95,6 +98,7 @@
       -make libs \
       -no-glib \
       -no-gstreamer \
+      -no-javascript-jit \
       -no-reduce-exports \
       -no-rpath \
       -make translations \
@@ -108,6 +112,7 @@
       -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX)
     $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++-4.6
   endif
+
 endif
 
 define $(PKG)_UPDATE
@@ -141,7 +146,6 @@
         -no-webkit \
         -no-phonon \
         -no-phonon-backend \
-        -no-javascript-jit \
         -accessibility \
         -nomake demos \
         -nomake docs \
@@ -200,16 +204,16 @@
     $(if $(filter-out msvc, $(MXE_SYSTEM)),
       $(if $(filter-out yes, $(MXE_NATIVE_BUILD)),
         $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin'
-        $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/moc' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc'
-        $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/rcc' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc'
-        $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/uic' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic'
-        $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/qmake' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake'
+        mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/moc' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc'
+        mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/rcc' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc'
+        mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/uic' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic'
+        mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/qmake' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake'
       )
 
       # lrelease (from linguist) needed by octave for GUI build
       $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' 
       $(MAKE) -C '$(1)/tools/linguist/lrelease' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)'
       $(if $(filter-out yes, $(MXE_NATIVE_BUILD)),
-        $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/lrelease' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease'))
+        mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/lrelease' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease'))
 
 endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/renderproto.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := renderproto
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.11
+$(PKG)_CHECKSUM := 69c6cbae5e67d3a47b31dbf4d711607545e1bb05
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/proto/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sm.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := sm
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.2.2
+$(PKG)_CHECKSUM := d8ac4f24e6a2783387982828c695f2716e337a13
+$(PKG)_SUBDIR   := libSM-$($(PKG)_VERSION)
+$(PKG)_FILE     := libSM-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
+$(PKG)_DEPS     := ice xproto xtrans
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- a/src/sqlite.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/sqlite.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,11 +3,11 @@
 
 PKG             := sqlite
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3080500
-$(PKG)_CHECKSUM := 7f667e10ccebc26ab2086b8a30cb0a600ca0acae
+$(PKG)_VERSION  := 3080702
+$(PKG)_CHECKSUM := 175283383d010709f76fdd13cb0c8c3c329a1c67
 $(PKG)_SUBDIR   := $(PKG)-autoconf-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://www.sqlite.org/$($(PKG)_FILE)
+$(PKG)_URL      := http://www.sqlite.org/2014/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-bash.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-bash
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 3.1.17-4
+$(PKG)_CHECKSUM := 
+$(PKG)_REMOTE_SUBDIR := bash/bash-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := bash-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/bash' | \
+    $(SED) -n 's,.*title="bash-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-coreutils.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-coreutils
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 5.97-3
+$(PKG)_CHECKSUM := b77b025d6bbbfac040ddba8cc56591bedb8abb63
+$(PKG)_REMOTE_SUBDIR := coreutils/coreutils-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := coreutils-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/coreutils' | \
+    $(SED) -n 's,.*title="coreutils-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-diffutils.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-diffutils
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.8.7.20071206cvs-3
+$(PKG)_CHECKSUM := 8fd96ee0639533a06aff49764234d50360624c3f
+$(PKG)_REMOTE_SUBDIR := diffutils/diffutils-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := diffutils-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/diffutils' | \
+    $(SED) -n 's,.*title="diffutils-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-dos2unix.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-dos2unix
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 6.0.3-1
+$(PKG)_CHECKSUM := 93b813726244ae1b2382014552de2e16b74f1e9f
+$(PKG)_REMOTE_SUBDIR := dos2unix/dos2unix-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := dos2unix-$($(PKG)_VERSION)-msys-1.0.17-src.tar.lzma
+$(PKG)_URL      := $(MSYS_EXTENSION_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_EXTENSION_URL)/dos2unix' | \
+    $(SED) -n 's,.*title="dos2unix-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-file.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-file
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 5.04-1
+$(PKG)_CHECKSUM := e30df31c333cdba1137dc236e005a64a604bde8e
+$(PKG)_REMOTE_SUBDIR := file/file-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := file-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/file' | \
+    $(SED) -n 's,.*title="file-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-findutils.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-findutils
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 4.4.2-2
+$(PKG)_CHECKSUM := 7f0552c56197e8c306845cc9e4334d3dd7a719da
+$(PKG)_REMOTE_SUBDIR := findutils/findutils-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := findutils-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/findutils' | \
+    $(SED) -n 's,.*title="findutils-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-gawk.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-gawk
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 3.1.7-2
+$(PKG)_CHECKSUM := c2b81658b06c2c4d0e40f34a54b6a7818da6325c
+$(PKG)_REMOTE_SUBDIR := gawk/gawk-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := gawk-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/gawk' | \
+    $(SED) -n 's,.*title="gawk-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-grep.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-grep
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.5.4-2
+$(PKG)_CHECKSUM := e950afc36c2450253785dd5d69f0bf8e5f2ee015
+$(PKG)_REMOTE_SUBDIR := grep/grep-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := grep-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/grep' | \
+    $(SED) -n 's,.*title="grep-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-gzip.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-gzip
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.3.12-2
+$(PKG)_CHECKSUM := c76bedc6e1afdb48bf10dd14b5c1986096e25290
+$(PKG)_REMOTE_SUBDIR := gzip/gzip-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := gzip-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/gzip' | \
+    $(SED) -n 's,.*title="gzip-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-less.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-less
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 436-2
+$(PKG)_CHECKSUM := 31dd72593f3a3298b54e80b006b4e2b883d3b592
+$(PKG)_REMOTE_SUBDIR := less/less-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := less-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/less' | \
+    $(SED) -n 's,.*title="less-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-libiconv.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-libiconv
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.14-1
+$(PKG)_CHECKSUM := 564888c41fb3ec4643d440112789504b18543541
+$(PKG)_REMOTE_SUBDIR := libiconv/libiconv-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := libiconv-$($(PKG)_VERSION)-msys-1.0.17-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/libiconv' | \
+    $(SED) -n 's,.*title="libiconv-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-libintl.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-libintl
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.18.1.1-1
+$(PKG)_CHECKSUM := 1829b35db16d223f2a74b85058855f26c829eadd
+$(PKG)_REMOTE_SUBDIR := gettext/gettext-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := gettext-$($(PKG)_VERSION)-msys-1.0.17-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/gettext' | \
+    $(SED) -n 's,.*title="gettext-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-libmagic.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-libmagic
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 5.04-1
+$(PKG)_CHECKSUM := e30df31c333cdba1137dc236e005a64a604bde8e
+$(PKG)_REMOTE_SUBDIR := file/file-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := file-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/file' | \
+    $(SED) -n 's,.*title="file-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-make.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-make
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 3.81-3
+$(PKG)_CHECKSUM := 6c5453bf2b47257573cc6be782986a83f219b78b
+$(PKG)_REMOTE_SUBDIR := make/make-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := make-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/make' | \
+    $(SED) -n 's,.*title="make-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-msys-core.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-msys-core
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.0.18-1
+$(PKG)_CHECKSUM := bf78894fcb9ce74e88ea5c7120739170494f158c
+$(PKG)_REMOTE_SUBDIR := msys-core/msys-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := msysCORE-$($(PKG)_VERSION)-msys-1.0.18-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/msys-core' | \
+    $(SED) -n 's,.*title="msys-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-patch.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-patch
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.6.1-1
+$(PKG)_CHECKSUM := bdf8933845b2e2d5aad5fc05bf2665845a8091a3
+$(PKG)_REMOTE_SUBDIR := patch/patch-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := patch-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_EXTENSION_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_EXTENSION_URL)/patch' | \
+    $(SED) -n 's,.*title="patch-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-regex.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-regex
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.20090805-2
+$(PKG)_CHECKSUM := 538cf83a0971d7e9f5679de2ad6af8da2d9b95a8
+$(PKG)_REMOTE_SUBDIR := regex/regex-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := regex-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/regex' | \
+    $(SED) -n 's,.*title="regex-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-sed.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-sed
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 4.2.1-2
+$(PKG)_CHECKSUM := 0d6341111cf2b627105f3c735015ffa2bd7a71d1
+$(PKG)_REMOTE_SUBDIR := sed/sed-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := sed-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/sed' | \
+    $(SED) -n 's,.*title="sed-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-tar.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-tar
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.23-1
+$(PKG)_CHECKSUM := f65c2f71f8c9c651d0f0b4be84e38205612ea5ee
+$(PKG)_REMOTE_SUBDIR := tar/tar-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := tar-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/tar' | \
+    $(SED) -n 's,.*title="tar-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-termcap.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-termcap
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.20050421_1-2
+$(PKG)_CHECKSUM := f5e22018742966dd57f6c5dbb73c2672ce07994b
+$(PKG)_REMOTE_SUBDIR := termcap/termcap-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := termcap-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_BASE_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_BASE_URL)/termcap' | \
+    $(SED) -n 's,.*title="termcap-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-unzip.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-unzip
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 6.0-1
+$(PKG)_CHECKSUM := 2138b68bb3d5215ec67fabbb467db7940e15c168
+$(PKG)_REMOTE_SUBDIR := unzip/unzip-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := unzip-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_EXTENSION_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_EXTENSION_URL)/unzip' | \
+    $(SED) -n 's,.*title="unzip-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-wget.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-wget
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.12-1
+$(PKG)_CHECKSUM := e4302886ab009c825db69917eb6e73bcb481c443
+$(PKG)_REMOTE_SUBDIR := wget/wget-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := wget-$($(PKG)_VERSION)-msys-1.0.13-src.tar.lzma
+$(PKG)_URL      := $(MSYS_EXTENSION_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_EXTENSION_URL)/wget' | \
+    $(SED) -n 's,.*title="wget-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/src-msys-zip.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,21 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := src-msys-zip
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 3.0-1
+$(PKG)_CHECKSUM := 6f408c4fd59f223828711df748d41cfe55b8ce7c
+$(PKG)_REMOTE_SUBDIR := zip/zip-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := zip-$($(PKG)_VERSION)-msys-1.0.14-src.tar.lzma
+$(PKG)_URL      := $(MSYS_EXTENSION_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- '$(MSYS_EXTENSION_URL)/zip' | \
+    $(SED) -n 's,.*title="zip-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/stable-octave-1-gnulib-isatty.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,39 @@
+Patch based on savannah.gnu.org/bugs/?327623#attached
+
+diff -ur octave-3.8.2-rc2.orig/libgnu/isatty.c octave-3.8.2-rc2/libgnu/isatty.c
+--- octave-3.8.2-rc2.orig/libgnu/isatty.c	2014-08-12 15:31:01.710229546 -0400
++++ octave-3.8.2-rc2/libgnu/isatty.c	2014-08-12 15:41:15.603406658 -0400
+@@ -34,7 +34,13 @@
+ 
+ /* Optimized test whether a HANDLE refers to a console.
+    See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>.  */
+-#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++//#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++static BOOL
++IsConsoleHandle(HANDLE h)
++{
++  DWORD mode;
++  return GetConsoleMode(h, &mode) != 0;
++}
+ 
+ #if HAVE_MSVC_INVALID_PARAMETER_HANDLER
+ static int
+diff -ur octave-3.8.2-rc2.orig/libgnu/select.c octave-3.8.2-rc2/libgnu/select.c
+--- octave-3.8.2-rc2.orig/libgnu/select.c	2014-08-12 15:31:01.704229427 -0400
++++ octave-3.8.2-rc2/libgnu/select.c	2014-08-12 15:44:44.268552023 -0400
+@@ -84,7 +84,14 @@
+ 
+ /* Optimized test whether a HANDLE refers to a console.
+    See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>.  */
+-#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++//#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++static BOOL
++IsConsoleHandle(HANDLE h)
++{
++  DWORD mode;
++  return GetConsoleMode(h, &mode) != 0;
++}
++
+ 
+ static BOOL
+ IsSocketHandle (HANDLE h)
--- a/src/stable-octave-1-xerror.patch	Wed Jul 09 09:25:57 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-# HG changeset patch
-# User John W. Eaton <jwe@octave.org>
-# Date 1395159558 14400
-#      Tue Mar 18 12:19:18 2014 -0400
-# Branch stable
-# Node ID 90dbbafb0502e80f5855239bc18eacdab5d85a29
-# Parent  c08776badd3d7d59b8c918a09710dfc1f18add3d
-prevent X11 errors from appearing in GUI command window
-
-* octave-gui.cc (fdstderr): New file scope variable.
-(octave_start_gui): Dup stderr.
-(message_handler): Use fdstderr for messages.
-
-diff --git a/libgui/src/octave-gui.cc b/libgui/src/octave-gui.cc
---- a/libgui/src/octave-gui.cc
-+++ b/libgui/src/octave-gui.cc
-@@ -85,28 +85,37 @@
-   int m_result;
- };
- 
-+#if ! defined (__WIN32__) || defined (__CYGWIN__)
-+static int fdstderr = -1;
-+#endif
- 
- // Custom message handler for filtering some messages from Qt.
- 
--void message_handler (QtMsgType type, const char *msg)
-+void
-+message_handler (QtMsgType type, const char *msg)
- {
-+#if ! defined (__WIN32__) || defined (__CYGWIN__)
-+  static FILE *errstream = fdopen (fdstderr, "a+");
-+#else
-+  static FILE *errstream = stderr;
-+#endif
-+
-   switch (type)
-     {
-     case QtDebugMsg:
--      if (strncmp (msg, "QFileSystemWatcher: skipping native engine",42) != 0)
--        std::cerr << "Debug: " << msg << std::endl;
-+      gnulib::fprintf (errstream, "Debug: %s\n", msg);
-       break;
- 
-     case QtWarningMsg:
--      std::cerr << "Warning: " << msg << std::endl;
-+      gnulib::fprintf (errstream, "Warning: %s\n", msg);
-       break;
- 
-     case QtCriticalMsg:
--      std::cerr << "Critical: " << msg << std::endl;
-+      gnulib::fprintf (errstream, "Critical: %s\n", msg);
-       break;
- 
-     case QtFatalMsg:
--      std::cerr << "Fatal: " << msg << std::endl;
-+      gnulib::fprintf (errstream, "Fatal: %s\n", msg);
-       abort ();
- 
-     default:
-@@ -122,6 +131,13 @@
- {
-   octave_thread_manager::block_interrupt_signal ();
- 
-+#if ! defined (__WIN32__) || defined (__CYGWIN__)
-+  // Store the file descriptor associated with the STDERR stream.  Send
-+  // Qt messages there instead of to the STDERR stream that will be
-+  // associated with the GUI command window.
-+  fdstderr = gnulib::dup (STDERR_FILENO);
-+#endif
-+
-   qInstallMsgHandler (message_handler);
- 
-   if (start_gui)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/stable-octave-2-winbelloff.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User John Donoghue <john.donoghue@ieee.org>
+# Date 1406465631 14400
+#      Sun Jul 27 08:53:51 2014 -0400
+# Branch gui-release
+# Node ID b2c1093f8e4a7c5865155430184fa90bed5f0b4b
+# Parent  c6b89c4a9e63d8c65e1a6a1703138b2a6bc9c5a9
+Disable bell in Windows (Bug #42268)
+
+* scripts/startup/inputrc: if term=cygwin, set bell style to none
+
+diff -r c6b89c4a9e63 -r b2c1093f8e4a scripts/startup/inputrc
+--- a/scripts/startup/inputrc	Wed Jul 23 08:52:42 2014 +0200
++++ b/scripts/startup/inputrc	Sun Jul 27 08:53:51 2014 -0400
+@@ -24,3 +24,8 @@
+ ## \C-q should still be available for quoted insert.
+ 
+ "\C-v": ""
++
++## In windows, disable audiable bell which is enabled by default
++$if term=cygwin
++   set bell-style none
++$endif
--- a/src/stable-octave-2-xerror.patch	Wed Jul 09 09:25:57 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-diff --git a/libgui/src/octave-gui.cc b/libgui/src/octave-gui.cc
---- a/libgui/src/octave-gui.cc
-+++ b/libgui/src/octave-gui.cc
-@@ -85,42 +85,11 @@
-   int m_result;
- };
- 
--#if ! defined (__WIN32__) || defined (__CYGWIN__)
--static int fdstderr = -1;
--#endif
-+// Disable all Qt messages by default.
- 
--// Custom message handler for filtering some messages from Qt.
--
--void
-+static void
- message_handler (QtMsgType type, const char *msg)
- {
--#if ! defined (__WIN32__) || defined (__CYGWIN__)
--  static FILE *errstream = fdopen (fdstderr, "a+");
--#else
--  static FILE *errstream = stderr;
--#endif
--
--  switch (type)
--    {
--    case QtDebugMsg:
--      gnulib::fprintf (errstream, "Debug: %s\n", msg);
--      break;
--
--    case QtWarningMsg:
--      gnulib::fprintf (errstream, "Warning: %s\n", msg);
--      break;
--
--    case QtCriticalMsg:
--      gnulib::fprintf (errstream, "Critical: %s\n", msg);
--      break;
--
--    case QtFatalMsg:
--      gnulib::fprintf (errstream, "Fatal: %s\n", msg);
--      abort ();
--
--    default:
--      break;
--    }
- }
- 
- // If START_GUI is false, we still set up the QApplication so that we
-@@ -131,14 +100,11 @@
- {
-   octave_thread_manager::block_interrupt_signal ();
- 
--#if ! defined (__WIN32__) || defined (__CYGWIN__)
--  // Store the file descriptor associated with the STDERR stream.  Send
--  // Qt messages there instead of to the STDERR stream that will be
--  // associated with the GUI command window.
--  fdstderr = gnulib::dup (STDERR_FILENO);
--#endif
-+  std::string show_gui_msgs = octave_env::getenv ("OCTAVE_SHOW_GUI_MESSAGES");
- 
--  qInstallMsgHandler (message_handler);
-+  // Installing our handler suppresses the messages.
-+  if (show_gui_msgs.empty ())
-+    qInstallMsgHandler (message_handler);
- 
-   if (start_gui)
-     {
-diff --git a/libinterp/dldfcn/__init_fltk__.cc b/libinterp/dldfcn/__init_fltk__.cc
---- a/libinterp/dldfcn/__init_fltk__.cc
-+++ b/libinterp/dldfcn/__init_fltk__.cc
-@@ -42,6 +42,10 @@
- 
- #ifdef HAVE_FLTK
- 
-+#if defined (HAVE_X_WINDOWS)
-+#include <X11/Xlib.h>
-+#endif
-+
- #include <map>
- #include <set>
- #include <sstream>
-@@ -73,6 +77,7 @@
- 
- #include "cmd-edit.h"
- #include "lo-ieee.h"
-+#include "oct-env.h"
- 
- #include "display.h"
- #include "file-ops.h"
-@@ -674,6 +679,14 @@
-   Fl_Menu_Bar* menubar;
- };
- 
-+#if defined (HAVE_X_WINDOWS)
-+static int
-+xerror_handler (Display *, XErrorEvent *)
-+{
-+  return 0;
-+}
-+#endif
-+
- class plot_window : public Fl_Window
- {
-   friend class fltk_uimenu;
-@@ -762,7 +775,18 @@
-           // Set WM_CLASS which allows window managers to properly group
-           // related windows.  Otherwise, the class is just "FLTK"
-           xclass ("Octave");
-+
-+          std::string show_gui_msgs
-+            = octave_env::getenv ("OCTAVE_SHOW_GUI_MESSAGES");
-+
-+#if defined (HAVE_X_WINDOWS)
-+          // Installing our handler suppresses the messages.
-+          if (show_gui_msgs.empty ())
-+            XSetErrorHandler (xerror_handler);
-+#endif
-+
-           show ();
-+
-           if (fp.get_currentaxes ().ok ())
-             show_canvas ();
-           else
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/stable-octave-3-fixes.patch	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,64 @@
+# HG changeset patch
+# User John W. Eaton <jwe@octave.org>
+# Date 1412519047 14400
+#      Sun Oct 05 10:24:07 2014 -0400
+# Branch stable
+# Node ID 3ffb8f53e94019084321d065390f4d4e215fd465
+# Parent  432ffa35de136a5dfd2a717a598750b62e6944f9
+use correct HDF5 size for octave_idx_type on Windows-64 (bug #43101)
+
+* ls-hdf5.h: Define H5T_NATIVE_IDX to H5T_NATIVE_INT64 when using
+64-bit indexing.
+
+diff --git a/libinterp/corefcn/ls-hdf5.h b/libinterp/corefcn/ls-hdf5.h
+--- a/libinterp/corefcn/ls-hdf5.h
++++ b/libinterp/corefcn/ls-hdf5.h
+@@ -204,7 +204,7 @@
+                       const char *attr_name, void *buf);
+ 
+ #ifdef USE_64_BIT_IDX_T
+-#define H5T_NATIVE_IDX H5T_NATIVE_LONG
++#define H5T_NATIVE_IDX H5T_NATIVE_INT64
+ #else
+ #define H5T_NATIVE_IDX H5T_NATIVE_INT
+ #endif
+# HG changeset patch
+# User John W. Eaton <jwe@octave.org>
+# Date 1412520111 14400
+#      Sun Oct 05 10:41:51 2014 -0400
+# Branch stable
+# Node ID 0279c601b49ce5d539b1ae938e8ec562b63f1ced
+# Parent  3ffb8f53e94019084321d065390f4d4e215fd465
+compute for loop indices consistently with range element results
+
+* pt-eval.cc (tree_evaluator::visit_simple_for_command): Use
+Range::elem instead of compuiting elements directly.  This change
+appears to fix obscure test failures in eig.cc-tst on 64-bit Windows
+systems.  See also task #13313.
+
+diff --git a/libinterp/parse-tree/pt-eval.cc b/libinterp/parse-tree/pt-eval.cc
+--- a/libinterp/parse-tree/pt-eval.cc
++++ b/libinterp/parse-tree/pt-eval.cc
+@@ -336,21 +336,10 @@
+         Range rng = rhs.range_value ();
+ 
+         octave_idx_type steps = rng.nelem ();
+-        double b = rng.base ();
+-        double increment = rng.inc ();
+ 
+         for (octave_idx_type i = 0; i < steps; i++)
+           {
+-            // Use multiplication here rather than declaring a
+-            // temporary variable outside the loop and using
+-            //
+-            //   tmp_val += increment
+-            //
+-            // to avoid problems with limited precision.  Also, this
+-            // is consistent with the way Range::matrix_value is
+-            // implemented.
+-
+-            octave_value val (b + i * increment);
++            octave_value val (rng.elem (i));
+ 
+             ult.assign (octave_value::op_asn_eq, val);
+ 
--- a/src/stable-octave-3-termfocus.patch	Wed Jul 09 09:25:57 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-diff -r 3283ce934648 libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp
---- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Fri Apr 04 11:40:40 2014 -0700
-+++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Fri Apr 04 20:38:10 2014 -0400
-@@ -267,9 +267,9 @@
- //////////////////////////////////////////////////////////////////////////////
- 
- QConsolePrivate::QConsolePrivate (QWinTerminalImpl* parent, const QString& cmd)
--  : q (parent), m_command (cmd), m_hasBlinkingCursor (true),
--    m_cursorType (BlockCursor), m_beginSelection (0, 0),
--    m_endSelection (0, 0), m_settingSelection (false),
-+  : q (parent), m_command (cmd), m_cursorBlinking (false),
-+    m_hasBlinkingCursor (true), m_cursorType (BlockCursor), 
-+    m_beginSelection (0, 0), m_endSelection (0, 0), m_settingSelection (false),
-     m_process (NULL), m_inWheelEvent (false)
- {
-   log (NULL);
--- a/src/stable-octave.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/stable-octave.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,15 +3,21 @@
 
 PKG             := stable-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.8.1
-$(PKG)_CHECKSUM := 2951aeafe58d562672feb80dd8c3cfe0643a5087
+$(PKG)_VERSION  := 3.8.2
+$(PKG)_CHECKSUM := 02c38e0f69bce4e6dd7be7d301898347085d9c2d
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE)
 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
   $(PKG)_FONTCONFIG := fontconfig
 endif
-$(PKG)_DEPS     := blas arpack curl fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qhull qrupdate qscintilla qt readline suitesparse texinfo zlib
+$(PKG)_DEPS     := blas arpack curl fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
+ifeq ($(MXE_WINDOWS_BUILD),no)
+  $(PKG)_DEPS += x11 xext
+endif
+ifeq ($(ENABLE_64),no)
+  $(PKG)_DEPS += qhull
+endif
 ifeq ($(ENABLE_JIT),yes)
   $(PKG)_DEPS += llvm
   $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit
@@ -37,7 +43,7 @@
 ifeq ($(MXE_NATIVE_BUILD),yes)
   $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
   ifeq ($(ENABLE_64),yes)
-    $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8
+    $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull F77_INTEGER_8_FLAG=-fdefault-integer-8
   endif
 else
   ifeq ($(MXE_SYSTEM),mingw)
@@ -45,7 +51,7 @@
       FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
       gl_cv_func_gettimeofday_clobber=no
     ifeq ($(ENABLE_64),yes)
-      $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes
+      $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes
     endif
   endif
 endif
--- a/src/suitesparse.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/suitesparse.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -10,7 +10,11 @@
 $(PKG)_URL_2    := https://distfiles.macports.org/SuiteSparse/$($(PKG)_FILE)
 $(PKG)_DEPS     := blas lapack
 
-$(PKG)_BLAS_LIB := blas
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+  $(PKG)_DESTDIR :=
+else
+  $(PKG)_DESTDIR := $(3)
+endif
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/' | \
@@ -37,9 +41,11 @@
 
 $(PKG)_CPPFLAGS := -DNTIMER
 
-ifeq ($(MXE_WINDOWS_BUILD),yes)
-  ifeq ($(ENABLE_64),yes)
+ifeq ($(ENABLE_64),yes)
+  ifeq ($(MXE_WINDOWS_BUILD),yes)
     $(PKG)_CPPFLAGS += -DLONGBLAS='long long'
+  else
+    $(PKG)_CPPFLAGS += -DLONGBLAS='long'
   endif
 endif
 
@@ -66,11 +72,11 @@
         CXXFLAGS='$(MXE_CXXFLAGS)' \
         AR='$(MXE_AR)' \
         RANLIB='$(MXE_RANLIB)' \
-        BLAS='-l$($(PKG)_BLAS_LIB) -lgfortran -lgfortranbegin' \
+        BLAS='-lblas -lgfortran -lgfortranbegin' \
         CHOLMOD_CONFIG='-DNPARTITION'
 
     # install library files
-    $(INSTALL) -d '$(3)$(HOST_LIBDIR)'
+    $(INSTALL) -d '$($(PKG)_DESTDIR)$(HOST_LIBDIR)'
 
     for f in $(addprefix $(1)/, $($(PKG)_STATICLIBS_1)); do \
       if [ $(BUILD_SHARED) = yes ]; then \
@@ -80,7 +86,7 @@
         deplibs=""; \
         case $$lib in \
           libcholmod) \
-            deplibs="-lamd -lcamd -lcolamd -lccolamd -lsuitesparseconfig -llapack -l$($(PKG)_BLAS_LIB)"; \
+            deplibs="-lamd -lcamd -lcolamd -lccolamd -lsuitesparseconfig -llapack -lblas"; \
           ;; \
           libklu) \
             deplibs="-lbtf -lamd -lcolamd -lsuitesparseconfig"; \
@@ -89,32 +95,32 @@
             deplibs="-lsuitesparseconfig"; \
           ;; \
 	  libspqr) \
-            deplibs="-lcholmod -lsuitesparseconfig -llapack -l$($(PKG)_BLAS_LIB)"; \
+            deplibs="-lcholmod -lsuitesparseconfig -llapack -lblas"; \
           ;; \
           libumfpack) \
-            deplibs="-lcholmod -lamd -lsuitesparseconfig -l$($(PKG)_BLAS_LIB)"; \
+            deplibs="-lcholmod -lamd -lsuitesparseconfig -lblas"; \
           ;; \
         esac; \
         if [ -n "$deplibs" ]; then \
           echo "  deplibs = $$deplibs"; \
         fi; \
-        $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CXX)' $$f --install '$(INSTALL)' --libdir '$(3)$(HOST_LIBDIR)' --bindir '$(3)$(HOST_BINDIR)' $$deplibs; \
+        $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CXX)' $$f --install '$(INSTALL)' --libdir '$($(PKG)_DESTDIR)$(HOST_LIBDIR)' --bindir '$($(PKG)_DESTDIR)$(HOST_BINDIR)' $$deplibs; \
       fi; \
     done
 
     # install include files
-    $(INSTALL) -d                                '$(3)$(HOST_INCDIR)/suitesparse/'
-    $(INSTALL) -m644 '$(1)/SuiteSparse_config/'*.h '$(3)$(HOST_INCDIR)/suitesparse/'
-    $(INSTALL) -m644 '$(1)/AMD/Include/'*.h      '$(3)$(HOST_INCDIR)/suitesparse/'
-    $(INSTALL) -m644 '$(1)/BTF/Include/'*.h      '$(3)$(HOST_INCDIR)/suitesparse/'
-    $(INSTALL) -m644 '$(1)/CAMD/Include/'*.h     '$(3)$(HOST_INCDIR)/suitesparse/'
-    $(INSTALL) -m644 '$(1)/CCOLAMD/Include/'*.h  '$(3)$(HOST_INCDIR)/suitesparse/'
-    $(INSTALL) -m644 '$(1)/CHOLMOD/Include/'*.h  '$(3)$(HOST_INCDIR)/suitesparse/'
-    $(INSTALL) -m644 '$(1)/COLAMD/Include/'*.h   '$(3)$(HOST_INCDIR)/suitesparse/'
-    $(INSTALL) -m644 '$(1)/CSparse/Include/'*.h  '$(3)$(HOST_INCDIR)/suitesparse/'
-    $(INSTALL) -m644 '$(1)/CXSparse/Include/'*.h '$(3)$(HOST_INCDIR)/suitesparse/'
-    $(INSTALL) -m644 '$(1)/KLU/Include/'*.h      '$(3)$(HOST_INCDIR)/suitesparse/'
-    $(INSTALL) -m644 '$(1)/LDL/Include/'*.h      '$(3)$(HOST_INCDIR)/suitesparse/'
-    $(INSTALL) -m644 '$(1)/SPQR/Include/'*       '$(3)$(HOST_INCDIR)/suitesparse/'
-    $(INSTALL) -m644 '$(1)/UMFPACK/Include/'*.h  '$(3)$(HOST_INCDIR)/suitesparse/'
+    $(INSTALL) -d                                '$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/'
+    $(INSTALL) -m644 '$(1)/SuiteSparse_config/'*.h '$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/'
+    $(INSTALL) -m644 '$(1)/AMD/Include/'*.h      '$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/'
+    $(INSTALL) -m644 '$(1)/BTF/Include/'*.h      '$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/'
+    $(INSTALL) -m644 '$(1)/CAMD/Include/'*.h     '$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/'
+    $(INSTALL) -m644 '$(1)/CCOLAMD/Include/'*.h  '$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/'
+    $(INSTALL) -m644 '$(1)/CHOLMOD/Include/'*.h  '$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/'
+    $(INSTALL) -m644 '$(1)/COLAMD/Include/'*.h   '$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/'
+    $(INSTALL) -m644 '$(1)/CSparse/Include/'*.h  '$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/'
+    $(INSTALL) -m644 '$(1)/CXSparse/Include/'*.h '$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/'
+    $(INSTALL) -m644 '$(1)/KLU/Include/'*.h      '$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/'
+    $(INSTALL) -m644 '$(1)/LDL/Include/'*.h      '$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/'
+    $(INSTALL) -m644 '$(1)/SPQR/Include/'*       '$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/'
+    $(INSTALL) -m644 '$(1)/UMFPACK/Include/'*.h  '$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/'
 endef
--- a/src/termcap.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/termcap.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -11,8 +11,9 @@
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package termcap.' >&2;
-    echo $(termcap_VERSION)
+    $(WGET) -q -O- 'http://ftp.gnu.org/gnu/termcap/?C=M;O=D' | \
+    $(SED) -n 's,.*<a href="termcap-\([0-9][^"]*\)\.tar.*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
--- a/src/wxwidgets.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/wxwidgets.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := wxwidgets
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.8.12
-$(PKG)_CHECKSUM := 39552f3e49341197fea8373824ec609c757e890b
+$(PKG)_VERSION  := 3.0.2
+$(PKG)_CHECKSUM := 6461eab4428c0a8b9e41781b8787510484dea800
 $(PKG)_SUBDIR   := wxMSW-$($(PKG)_VERSION)
 $(PKG)_FILE     := wxMSW-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/wxwindows/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/x11.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := x11
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.6.2
+$(PKG)_CHECKSUM := 351ae5bad88bb2b54b7f749f6096b518a3b13b29
+$(PKG)_SUBDIR   := libX11-$($(PKG)_VERSION)
+$(PKG)_FILE     := libX11-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
+$(PKG)_DEPS     := inputproto kbproto xcb xextproto xproto xtrans
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xau.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xau
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.0.8
+$(PKG)_CHECKSUM := 2544aa44737897832d9bf80151f30f7e0bb4f341
+$(PKG)_SUBDIR   := libXau-$($(PKG)_VERSION)
+$(PKG)_FILE     := libXau-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
+$(PKG)_DEPS     := xproto
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xcb-proto.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xcb-proto
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.11
+$(PKG)_CHECKSUM := dd06c90b17954b96527028e9f5a108fb92cd8694
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/xcb/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xcb.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xcb
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.11
+$(PKG)_CHECKSUM := 69a2f447a10918d005c33a8391492d0443533df7
+$(PKG)_SUBDIR   := libxcb-$($(PKG)_VERSION)
+$(PKG)_FILE     := libxcb-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/xcb/$($(PKG)_FILE)
+$(PKG)_DEPS     := pthread-stubs xau xcb-proto
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xdamage.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xdamage
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.1.4
+$(PKG)_CHECKSUM := f357e25af6fe05ae76af2acf2250969652f3a1b0
+$(PKG)_SUBDIR   := libXdamage-$($(PKG)_VERSION)
+$(PKG)_FILE     := libXdamage-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
+$(PKG)_DEPS     := damageproto xfixes fixesproto xextproto x11
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xdmcp.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xdmcp
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.1.1
+$(PKG)_CHECKSUM := 62f1a6011df19c0b9ad60cbffd23cb36c0edfb95
+$(PKG)_SUBDIR   := libXdmcp-$($(PKG)_VERSION)
+$(PKG)_FILE     := libXdmcp-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xext.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xext
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.3.3
+$(PKG)_CHECKSUM := 8e221b6f706c43106a1c8aebe1229d86859d1ebf
+$(PKG)_SUBDIR   := libXext-$($(PKG)_VERSION)
+$(PKG)_FILE     := libXext-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
+$(PKG)_DEPS     := xextproto xproto
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xextproto.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xextproto
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 7.3.0
+$(PKG)_CHECKSUM := f9dd1fa2d8ed6261dee193a8f8f7a61a4cb398ef
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/proto/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xf86vidmodeproto.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xf86vidmodeproto
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.3.1
+$(PKG)_CHECKSUM := b11943e6be5fe8e3c651bd220dc1d2d3ebdd9c92
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/proto/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xfixes.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xfixes
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 5.0.1
+$(PKG)_CHECKSUM := 88e9fe9c3288feb5362fe97fa7ae534f724b75e3
+$(PKG)_SUBDIR   := libXfixes-$($(PKG)_VERSION)
+$(PKG)_FILE     := libXfixes-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
+$(PKG)_DEPS     := fixesproto xextproto xproto x11
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xft.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xft
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.3.2
+$(PKG)_CHECKSUM := 0568a360a9f3ca97bdcdaf61535bf9d0bdae80db
+$(PKG)_SUBDIR   := libXft-$($(PKG)_VERSION)
+$(PKG)_FILE     := libXft-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/releases/individual/lib/$($(PKG)_FILE)
+$(PKG)_DEPS     := kbproto xrender fontconfig freetype
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xproto.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xproto
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 7.0.26
+$(PKG)_CHECKSUM := e258c9961944979fbd26e3b04ab108e88e01f4e0
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/proto/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xrender.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xrender
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.9.8
+$(PKG)_CHECKSUM := 6fa642737be327cd7166995a626d429669e16a76
+$(PKG)_SUBDIR   := libXrender-$($(PKG)_VERSION)
+$(PKG)_FILE     := libXrender-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
+$(PKG)_DEPS     := xproto renderproto
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xt.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xt
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.1.4
+$(PKG)_CHECKSUM := a691f0ddf664e21b12781ea0724297cd063a3452
+$(PKG)_SUBDIR   := libXt-$($(PKG)_VERSION)
+$(PKG)_FILE     := libXt-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
+$(PKG)_DEPS     := sm ice x11 xproto kbproto
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xtrans.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,29 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xtrans
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.3.5
+$(PKG)_CHECKSUM := 0e94776e31fd29e323edc7f2a8ee10794d63c24c
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+
+    mv '$(3)/$(HOST_PREFIX)/share/pkgconfig/xtrans.pc' '$(HOST_PREFIX)/lib/pkgconfig/xtrans.pc'
+  endef
+endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xxf86vm.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xxf86vm
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.1.3
+$(PKG)_CHECKSUM := a66a298471f33ba7d63bc76db14fdb3f89319a20
+$(PKG)_SUBDIR   := libXxf86vm-$($(PKG)_VERSION)
+$(PKG)_FILE     := libXxf86vm-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
+$(PKG)_DEPS     := xproto x11 xextproto xext xf86vidmodeproto
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
--- a/src/xz.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/xz.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := xz
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.0.5
-$(PKG)_CHECKSUM := 26fec2c1e409f736e77a85e4ab314dc74987def0
+$(PKG)_VERSION  := 5.0.7
+$(PKG)_CHECKSUM := da6d81015333785fc9399ab129e6f53fe1cbf350
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://tukaani.org/xz/$($(PKG)_FILE)
--- a/src/yasm.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/yasm.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -2,8 +2,8 @@
 # See index.html for further information.
 
 PKG             := yasm
-$(PKG)_VERSION  := 1.2.0
-$(PKG)_CHECKSUM := 773d28f27f83c44ac35079add0d3167ca6c1def8
+$(PKG)_VERSION  := 1.3.0
+$(PKG)_CHECKSUM := b7574e9f0826bedef975d64d3825f75fbaeef55e
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.tortall.net/projects/$(PKG)/releases/$($(PKG)_FILE)
--- a/src/zeromq-1.patch	Wed Jul 09 09:25:57 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -ur zeromq-4.0.3.orig/src/socket_base.cpp zeromq-4.0.3/src/socket_base.cpp
---- zeromq-4.0.3.orig/src/socket_base.cpp	2014-02-06 17:38:06.285815420 +0000
-+++ zeromq-4.0.3/src/socket_base.cpp	2014-02-06 17:38:19.024897442 +0000
-@@ -119,7 +119,7 @@
-             errno = EINVAL;
-             return NULL;
-     }
--    if (s->mailbox.get_fd () == -1)
-+    if (s->mailbox.get_fd () == retired_fd)
-         return NULL;
- 
-     alloc_assert (s);
--- a/src/zeromq.mk	Wed Jul 09 09:25:57 2014 -0400
+++ b/src/zeromq.mk	Tue Dec 30 14:35:32 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := zeromq
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.0.3
-$(PKG)_CHECKSUM := a363ddfff75f73976f656b3ba48f32544b214075
+$(PKG)_VERSION  := 4.0.5
+$(PKG)_CHECKSUM := a664ec63661a848ef46114029156a0a6006feecd
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://download.zeromq.org/$($(PKG)_FILE)