36 files changed, 487 insertions, 324 deletions
diff --git a/src/aspell.mk b/src/aspell.mk
index 1a6cb34..6e17ade 100644
--- a/src/aspell.mk
+++ b/src/aspell.mk
@@ -22,5 +22,10 @@ define $(PKG)_BUILD
         --enable-win32-relocatable \
         --disable-curses \
         --disable-nls
+
+    # libtool misses some dependency libs and there's no lt_cv* etc. options
+    $(if $(BUILD_SHARED),\
+        $(SED) -i 's#^postdeps="-#postdeps="-lpthread -#g' '$(1)/libtool')
+
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
diff --git a/src/autoconf.mk b/src/autoconf.mk
deleted file mode 100644
index 93c2ffb..0000000
--- a/src/autoconf.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG             := autoconf
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.69
-$(PKG)_CHECKSUM := 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://ftp.gnu.org/pub/gnu/autoconf/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://ftp.gnu.org/pub/gnu/autoconf/$($(PKG)_FILE)
-$(PKG)_DEPS     := m4
-
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://ftp.gnu.org/gnu/autoconf/?C=M;O=D' | \
-    $(SED) -n 's,.*<a href="autoconf-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    $(SORT) -V | \
-    tail -1
-endef
-
-define $(PKG)_BUILD_$(BUILD)
-    mkdir '$(1).build'
-    cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
-endef
diff --git a/src/automake.mk b/src/automake.mk
deleted file mode 100644
index 6ad1496..0000000
--- a/src/automake.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG             := automake
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.14.1
-$(PKG)_CHECKSUM := 814c2333f350ce00034a1fe718e0e4239998ceea7b0aff67e9fd273ed6dfc23b
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://ftp.gnu.org/pub/gnu/automake/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://ftp.gnu.org/pub/gnu/automake/$($(PKG)_FILE)
-$(PKG)_DEPS     := autoconf
-
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://ftp.gnu.org/gnu/automake/?C=M;O=D' | \
-    $(SED) -n 's,.*<a href="automake-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    $(SORT) -V | \
-    tail -1
-endef
-
-define $(PKG)_BUILD_$(BUILD)
-    mkdir '$(1).build'
-    cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)' man1_MANS=
-    $(MAKE) -C '$(1).build' -j 1 install man1_MANS=
-endef
diff --git a/src/bison.mk b/src/bison.mk
deleted file mode 100644
index eeb766f..0000000
--- a/src/bison.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG             := bison
-$(PKG)_IGNORE   := 3%
-$(PKG)_VERSION  := 2.7.1
-$(PKG)_CHECKSUM := b409adcbf245baadb68d2f66accf6fdca5e282cafec1b865f4b5e963ba8ea7fb
-$(PKG)_SUBDIR   := bison-$($(PKG)_VERSION)
-$(PKG)_FILE     := bison-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://ftp.gnu.org/pub/gnu/bison/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://ftp.gnu.org/pub/gnu/bison/$($(PKG)_FILE)
-$(PKG)_DEPS     := flex
-
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://ftp.gnu.org/gnu/bison/?C=M;O=D' | \
-    $(SED) -n 's,.*<a href="bison-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    $(SORT) -V | \
-    tail -1
-endef
-
-define $(PKG)_BUILD_$(BUILD)
-    mkdir '$(1).build'
-    cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
-endef
diff --git a/src/cloog.mk b/src/cloog.mk
new file mode 100644
index 0000000..40d4c8b
--- /dev/null
+++ b/src/cloog.mk
@@ -0,0 +1,34 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := cloog
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.18.1
+$(PKG)_CHECKSUM := 02500a4edd14875f94fe84cbeda4290425cb0c1c2474c6f75d75a303d64b4196
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://www.bastoul.net/cloog/pages/download/$($(PKG)_FILE)
+$(PKG)_URL_2    := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
+$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
+$(PKG)_DEPS     := gcc gmp isl
+
+$(PKG)_DEPS_$(BUILD) := gmp isl
+
+# stick to tested versions from gcc
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'ftp://gcc.gnu.org/pub/gcc/infrastructure/' | \
+    $(SED) -n 's,.*cloog-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    $(SORT) -V |
+    tail -1
+endef
+
+define $(PKG)_BUILD_$(BUILD)
+    cd '$(1)' && ./configure \
+        $(MXE_CONFIGURE_OPTS) \
+        --with-gmp-prefix='$(PREFIX)/$(TARGET)' \
+        --with-isl-prefix='$(PREFIX)/$(TARGET)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+endef
+
+$(PKG)_BUILD_SHARED =
diff --git a/src/coin-1-fixes.patch b/src/coin-1-fixes.patch
new file mode 100644
index 0000000..cb5ced1
--- /dev/null
+++ b/src/coin-1-fixes.patch
@@ -0,0 +1,153 @@
+This file is part of MXE.
+See index.html for further information.
+
+This patch has been taken from: https://bitbucket.org/msys2/coin/commits/69e9990b05cee506f5fa16c6edad02a7808bc610/raw/
+
+It was modified to work with Coin 3.1.3.
+(The order of the template arguments of SbHash was switched.)
+
+diff --git a/include/Inventor/C/glue/spidermonkey.h b/include/Inventor/C/glue/spidermonkey.h
+--- a/include/Inventor/C/glue/spidermonkey.h
++++ b/include/Inventor/C/glue/spidermonkey.h
+@@ -56,7 +56,7 @@
+    Structs and defines.
+ */
+ typedef int JSBool;
+-typedef long jsword;
++typedef intmax_t jsword;
+ typedef jsword jsval;
+ typedef jsword jsid;
+ typedef int intN;
+diff --git a/src/foreignfiles/SoSTLFileKit.cpp b/src/foreignfiles/SoSTLFileKit.cpp
+--- a/src/foreignfiles/SoSTLFileKit.cpp
++++ b/src/foreignfiles/SoSTLFileKit.cpp
+@@ -566,14 +566,14 @@
+     SO_GET_ANY_PART(this, "facets", SoIndexedFaceSet);
+ 
+   // find existing indexes if any
+-  long v1idx = PRIVATE(this)->points->findPoint(v1), v1new = (v1idx == -1);
+-  long v2idx = PRIVATE(this)->points->findPoint(v2), v2new = (v2idx == -1);
+-  long v3idx = PRIVATE(this)->points->findPoint(v3), v3new = (v3idx == -1);
+-  if (!v1new) { v1idx = (long) PRIVATE(this)->points->getUserData(v1idx); }
+-  if (!v2new) { v2idx = (long) PRIVATE(this)->points->getUserData(v2idx); }
+-  if (!v3new) { v3idx = (long) PRIVATE(this)->points->getUserData(v3idx); }
+-  long nidx = PRIVATE(this)->normals->findPoint(n);
+-  if (nidx != -1) { nidx = (long) PRIVATE(this)->normals->getUserData(nidx); }
++  intmax_t v1idx = PRIVATE(this)->points->findPoint(v1), v1new = (v1idx == -1);
++  intmax_t v2idx = PRIVATE(this)->points->findPoint(v2), v2new = (v2idx == -1);
++  intmax_t v3idx = PRIVATE(this)->points->findPoint(v3), v3new = (v3idx == -1);
++  if (!v1new) { v1idx = (intmax_t) PRIVATE(this)->points->getUserData(v1idx); }
++  if (!v2new) { v2idx = (intmax_t) PRIVATE(this)->points->getUserData(v2idx); }
++  if (!v3new) { v3idx = (intmax_t) PRIVATE(this)->points->getUserData(v3idx); }
++  intmax_t nidx = PRIVATE(this)->normals->findPoint(n);
++  if (nidx != -1) { nidx = (intmax_t) PRIVATE(this)->normals->getUserData(nidx); }
+ 
+   // toss out invalid facets - facets where two or more points are in
+   // the same location.  what are these - are they lines and points or
+diff --git a/src/threads/thread.cpp b/src/threads/thread.cpp
+--- a/src/threads/thread.cpp
++++ b/src/threads/thread.cpp
+@@ -130,7 +130,7 @@
+ void
+ cc_sleep(float seconds)
+ {
+-#ifndef _WIN32
++#if !defined(_WIN32) || defined(__MINGW32__)
+   /* FIXME: 20011107, thammer: create a configure macro to detect
+    * which sleep function is available */
+   sleep(floor(seconds));
+@@ -164,7 +164,7 @@
+       assert(0 && "unexpected failure");
+     }
+   }
+-  return (unsigned long) val;
++  return static_cast<unsigned long>(reinterpret_cast<intptr_t>(val));
+ }
+ 
+ static void 
+diff --git a/src/threads/thread_win32.icc b/src/threads/thread_win32.icc
+--- a/src/threads/thread_win32.icc
++++ b/src/threads/thread_win32.icc
+@@ -38,7 +38,7 @@
+ cc_w32thread_thread_proc(LPVOID lpParameter)
+ {
+   cc_thread *thread = (cc_thread *)lpParameter;
+-  return (DWORD) thread->func(thread->closure);
++  return static_cast<DWORD>(reinterpret_cast<intptr_t>(thread->func(thread->closure)));
+ }
+ 
+ static int
+diff --git a/src/vrml97/JS_VRMLClasses.cpp b/src/vrml97/JS_VRMLClasses.cpp
+--- a/src/vrml97/JS_VRMLClasses.cpp
++++ b/src/vrml97/JS_VRMLClasses.cpp
+@@ -110,8 +110,11 @@
+ struct CoinVrmlJs_SensorInfo {
+   SbList <JSObject *> objects;
+ };
++#if defined(_WIN64)
++SbHash <void *, unsigned long long> * CoinVrmlJs_sensorinfohash = NULL;
++#else
+ SbHash <void *, unsigned long> * CoinVrmlJs_sensorinfohash = NULL;
+-
++#endif
+ 
+ const char * CoinVrmlJs_SFColorAliases[] = {"r", "g", "b"};
+ const char * CoinVrmlJs_SFRotationAliases[] = {"x", "y", "z", "angle"};
+@@ -674,7 +677,11 @@
+ {
+   SoNode * node = ((SoNodeSensor *) sensor)->getAttachedNode();
+   void * tmp;
++#if defined(_WIN64)
++  if(!CoinVrmlJs_sensorinfohash->get((unsigned long long) node, tmp)) {
++#else
+   if(!CoinVrmlJs_sensorinfohash->get((unsigned long) node, tmp)) {
++#endif
+     assert(FALSE && "Trying to delete an unregistered SoNodeSensor. Internal error.");
+     return;
+   }
+@@ -690,7 +697,11 @@
+ 
+   // Store the sensor-pointer so that it can be properly deleted later
+   nodesensorstobedeleted->append((SoNodeSensor *) sensor);
++#if defined(_WIN64)
++  CoinVrmlJs_sensorinfohash->remove((unsigned long long) node);
++#else
+   CoinVrmlJs_sensorinfohash->remove((unsigned long) node);
++#endif
+   delete si;
+ }
+ 
+@@ -1428,13 +1439,21 @@
+ {
+   // Has the hash-table been initialized?
+   if (!CoinVrmlJs_sensorinfohash) {
++#if defined(_WIN64)
++    CoinVrmlJs_sensorinfohash = new SbHash <void *, unsigned long long>;
++#else
+     CoinVrmlJs_sensorinfohash = new SbHash <void *, unsigned long>;
++#endif
+     coin_atexit(deleteSensorInfoHash, CC_ATEXIT_NORMAL);
+   }
+ 
+   // Is a sensor already attached to this SoNode?
+   void * tmp;
++#if defined(_WIN64)
++  if (CoinVrmlJs_sensorinfohash->get((unsigned long long) node, tmp)) {
++#else
+   if (CoinVrmlJs_sensorinfohash->get((unsigned long) node, tmp)) {
++#endif
+     CoinVrmlJs_SensorInfo * si = (CoinVrmlJs_SensorInfo *) tmp;
+     si->objects.append(obj);
+   }
+@@ -1444,7 +1463,11 @@
+     ns->attach(node);
+     CoinVrmlJs_SensorInfo * si = new CoinVrmlJs_SensorInfo;
+     si->objects.append(obj);
++#if defined(_WIN64)
++    CoinVrmlJs_sensorinfohash->put((unsigned long long) node, si);
++#else
+     CoinVrmlJs_sensorinfohash->put((unsigned long) node, si);
++#endif
+   }
+ }
+ 
diff --git a/src/coin-test.cpp b/src/coin-test.cpp
new file mode 100644
index 0000000..0974407
--- /dev/null
+++ b/src/coin-test.cpp
@@ -0,0 +1,24 @@
+/*
+ * This file is part of MXE.
+ * See index.html for further information.
+ */
+
+#include <Inventor/C/errors/debugerror.h>
+#include <Inventor/nodes/SoCone.h>
+#include <Inventor/nodes/SoDirectionalLight.h>
+#include <Inventor/nodes/SoMaterial.h>
+#include <Inventor/nodes/SoPerspectiveCamera.h>
+#include <Inventor/nodes/SoSeparator.h>
+
+int main()
+{
+   SoSeparator *root = new SoSeparator;
+   SoPerspectiveCamera *myCamera = new SoPerspectiveCamera;
+   SoMaterial *myMaterial = new SoMaterial;
+   root->ref();
+   root->addChild(myCamera);
+   root->addChild(new SoDirectionalLight);
+   myMaterial->diffuseColor.setValue(1.0, 0.0, 0.0);
+   root->addChild(myMaterial);
+   root->addChild(new SoCone);
+}
diff --git a/src/coin.mk b/src/coin.mk
new file mode 100644
index 0000000..c66791e
--- /dev/null
+++ b/src/coin.mk
@@ -0,0 +1,39 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := coin
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 3.1.3
+$(PKG)_CHECKSUM := 583478c581317862aa03a19f14c527c3888478a06284b9a46a0155fa5886d417
+$(PKG)_SUBDIR   := Coin-$($(PKG)_VERSION)
+$(PKG)_FILE     := Coin-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://bitbucket.org/Coin3D/coin/downloads/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc dlfcn-win32
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'https://bitbucket.org/Coin3D/coin/downloads' | \
+    $(SED) -n 's,.*Coin-\([0-9.]*\).tar.gz.*,\1,p' | \
+    $(SORT) -V | \
+    tail -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        $(MXE_CONFIGURE_OPTS) \
+        --disable-debug \
+        --disable-symbols \
+        --enable-compact \
+        --without-x \
+        COIN_STATIC=$(if $(BUILD_STATIC),true,false)
+
+    # libtool misses some dependency libs and there's no lt_cv* etc. options
+    $(SED) -i 's,^postdeps="-,postdeps="-ldl -lopengl32 -lgdi32 -lwinmm -,g' '$(1)/libtool'
+
+    $(MAKE) -C '$(1)' -j '$(JOBS)'
+    $(MAKE) -C '$(1)' -j 1 install
+
+    '$(TARGET)-g++' \
+        -W -Wall -pedantic \
+        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-coin.exe' \
+        `'$(TARGET)-pkg-config' Coin --cflags --libs`
+endef
diff --git a/src/coreutils.mk b/src/coreutils.mk
deleted file mode 100644
index a9d0f0d..0000000
--- a/src/coreutils.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG             := coreutils
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 8.23
-$(PKG)_CHECKSUM := ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gettext gmp libiconv libtool
-
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://ftp.gnu.org/gnu/coreutils/?C=M;O=D' | \
-    $(SED) -n 's,.*<a href="coreutils-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    $(SORT) -V | \
-    tail -1
-endef
-
-define $(PKG)_BUILD_$(BUILD)
-    mkdir '$(1).build'
-    cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)' man1_MANS=
-    $(MAKE) -C '$(1).build' -j 1 install man1_MANS=
-endef
diff --git a/src/dbus.mk b/src/dbus.mk
index 105da1e..158d0a3 100644
--- a/src/dbus.mk
+++ b/src/dbus.mk
@@ -3,8 +3,8 @@
 
 PKG             := dbus
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.10.2
-$(PKG)_CHECKSUM := aef3f49595df09b0824433ee993cda748ede93693a719a831562ae1616b6bb9e
+$(PKG)_VERSION  := 1.10.4
+$(PKG)_CHECKSUM := ad7dcad73ad9b0ff55819985d354eacfffe07e2eb8c763e155efc21d6001084b
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE)
diff --git a/src/dlfcn-win32-1.fixes.patch b/src/dlfcn-win32-1.fixes.patch
new file mode 100644
index 0000000..fca8b88
--- /dev/null
+++ b/src/dlfcn-win32-1.fixes.patch
@@ -0,0 +1,25 @@
+This file is part of MXE.
+See index.html for further information.
+
+From f46d92e319ba2ce4d5fe46e4293a7f7fbb67935e Mon Sep 17 00:00:00 2001
+From: Boris Nagaev <bnagaev@gmail.com>
+Date: Sun, 15 Nov 2015 13:23:50 +0000
+Subject: [PATCH] configure: remove /tmp/test.dll /tmp/test.c
+
+
+diff --git a/configure b/configure
+index 91f7d07..e3473fe 100755
+--- a/configure
++++ b/configure
+@@ -160,7 +160,7 @@ void function(void)
+ { LoadLibrary(NULL); }
+ EOF
+ echo testing compiler: $cc -shared -o /tmp/test.dll /tmp/test.c
+-$cc -shared -o /tmp/test.dll /tmp/test.c
++$cc -shared -o /tmp/test.dll /tmp/test.c && rm /tmp/test.dll /tmp/test.c
+ 
+ test "$?" != 0 && {
+     echo "$cc could not create shared file with Windows API functions.";
+-- 
+2.1.4
+
diff --git a/src/dlfcn-win32.mk b/src/dlfcn-win32.mk
index ffac1fd..2daaea5 100644
--- a/src/dlfcn-win32.mk
+++ b/src/dlfcn-win32.mk
@@ -25,6 +25,5 @@ define $(PKG)_BUILD
             --disable-static --enable-shared )
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
-
-    # No test avalable temprorarily because MXE doesn't support shared build yet
+    $(MAKE) -C '$(1)' -j '$(JOBS)' test.exe testdll.dll
 endef
diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk
index f57fe8c..79f256c 100644
--- a/src/ffmpeg.mk
+++ b/src/ffmpeg.mk
@@ -3,8 +3,8 @@
 
 PKG             := ffmpeg
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.7.2
-$(PKG)_CHECKSUM := 7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2
+$(PKG)_VERSION  := 2.8.2
+$(PKG)_CHECKSUM := 830ec647f7ad774fc0caf17ba47774bf5dee7a89cbd65894f364a87ba3ad21b2
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://www.ffmpeg.org/releases/$($(PKG)_FILE)
diff --git a/src/flex.mk b/src/flex.mk
deleted file mode 100644
index e03144b..0000000
--- a/src/flex.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG             := flex
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.5.39
-$(PKG)_CHECKSUM := add2b55f3bc38cb512b48fad7d72f43b11ef244487ff25fc00aabec1e32b617f
-$(PKG)_SUBDIR   := flex-$($(PKG)_VERSION)
-$(PKG)_FILE     := flex-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/flex/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
-
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://sourceforge.net/projects/flex/files/' | \
-    grep -i 'flex/files/' | \
-    $(SED) -n 's,.*/flex-\([0-9\.]*\)\.tar.*/.*,\1,p' | \
-    head -1
-endef
-
-define $(PKG)_BUILD_$(BUILD)
-    mkdir '$(1).build'
-    cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
-endef
diff --git a/src/gcc.mk b/src/gcc.mk
index 4e7bbf7..be8d5f6 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -3,8 +3,8 @@
 
 PKG             := gcc
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.2.0
-$(PKG)_CHECKSUM := 5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad
+$(PKG)_VERSION  := 4.9.3
+$(PKG)_CHECKSUM := 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -44,6 +44,7 @@ define $(PKG)_CONFIGURE
         --with-isl='$(PREFIX)/$(BUILD)' \
         --with-mpc='$(PREFIX)/$(BUILD)' \
         --with-mpfr='$(PREFIX)/$(BUILD)' \
+        --with-cloog='$(PREFIX)/$(BUILD)' \
         --with-as='$(PREFIX)/bin/$(TARGET)-as' \
         --with-ld='$(PREFIX)/bin/$(TARGET)-ld' \
         --with-nm='$(PREFIX)/bin/$(TARGET)-nm' \
@@ -52,14 +53,13 @@ endef
 
 define $(PKG)_POST_BUILD
     # TODO: find a way to configure the installation of these correctly
-    rm -f $(addprefix $(PREFIX)/$(TARGET)/bin/, c++ g++ gcc gfortran)
-    -mv '$(PREFIX)/lib/gcc/$(TARGET)/lib/'* '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'
-    -mv '$(PREFIX)/lib/gcc/$(TARGET)/'*.dll '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'
-    -mv '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/'
-    -cp '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll.a '$(PREFIX)/$(TARGET)/lib/'
-
-    # remove incorrectly installed libcc1
-    rm -f '$(PREFIX)/lib/'libcc1*
+    # ignore rm failure as parallel build may have cleaned up, but
+    # don't wildcard all libs so future additions will be detected
+    $(and $(BUILD_SHARED),
+    mv  -v '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/gcc-$($(PKG)_VERSION)/'
+    -rm -v '$(PREFIX)/lib/gcc/$(TARGET)/'libgcc_s*.dll
+    -rm -v '$(PREFIX)/lib/gcc/$(TARGET)/lib/'libgcc_s*.a
+    -rmdir '$(PREFIX)/lib/gcc/$(TARGET)/lib/')
 endef
 
 define $(PKG)_BUILD_mingw-w64
@@ -97,11 +97,16 @@ define $(PKG)_BUILD_mingw-w64
     # build rest of gcc
     cd '$(1).build'
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
-
-    # cc1libdir isn't passed to subdirs so install correctly and rm later
-    $(MAKE) -C '$(1).build/libcc1' -j 1 install cc1libdir='$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)'
     $(MAKE) -C '$(1).build' -j 1 install
 
+    # shared libgcc isn't installed to version-specific locations
+    # so install correctly to avoid clobbering with multiple versions
+    $(and $(BUILD_SHARED),
+    $(MAKE) -C '$(1).build/$(TARGET)/libgcc' -j 1 \
+        toolexecdir='$(PREFIX)/$(TARGET)/bin/gcc-$($(PKG)_VERSION)' \
+        SHLIB_SLIBDIR_QUAL= \
+        install-shared)
+
     $($(PKG)_POST_BUILD)
 endef
 
diff --git a/src/gperf.mk b/src/gperf.mk
deleted file mode 100644
index 54bb5b2..0000000
--- a/src/gperf.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG             := gperf
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.0.4
-$(PKG)_CHECKSUM := 767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
-
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://ftp.gnu.org/gnu/gperf/?C=M;O=D' | \
-    $(SED) -n 's,.*<a href="gperf-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    $(SORT) -V | \
-    tail -1
-endef
-
-define $(PKG)_BUILD_$(BUILD)
-    mkdir '$(1).build'
-    cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
-endef
diff --git a/src/gtk3-test.c b/src/gtk3-test.c
index 7442034..3241fa4 100644
--- a/src/gtk3-test.c
+++ b/src/gtk3-test.c
@@ -14,7 +14,7 @@ static void activate(GtkApplication *app)
   button = gtk_button_new_with_label("Hello World");
 
   g_signal_connect_swapped(button, "clicked",
-			   G_CALLBACK(gtk_widget_destroy), window);
+               G_CALLBACK(gtk_widget_destroy), window);
   gtk_container_add(GTK_CONTAINER(window), button);
 
   gtk_widget_show_all(window);
diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk
index f5b3bcc..b655ca4 100644
--- a/src/harfbuzz.mk
+++ b/src/harfbuzz.mk
@@ -3,8 +3,8 @@
 
 PKG             := harfbuzz
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.6
-$(PKG)_CHECKSUM := f616a7fbdc78a627043f9029000bf08c0c71df59cde4143fc92a014f6a993b26
+$(PKG)_VERSION  := 1.1.0
+$(PKG)_CHECKSUM := 0f584a5947e60ede565e7a4e122baa5e4b17a62eab872abf5f73d8552ceb716b
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE)
diff --git a/src/intltool.mk b/src/intltool.mk
deleted file mode 100644
index f11d5a6..0000000
--- a/src/intltool.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG             := intltool
-$(PKG)_VERSION  := 0.50.2
-$(PKG)_CHECKSUM := 67f25c5c6fb71d095793a7f895b245e65e829e8bde68c6c8b4c912144ff34406
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://launchpad.net/intltool/trunk/$($(PKG)_VERSION)/+download/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
-
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://launchpad.net/intltool/+download' | \
-    $(SED) -n 's,.*https://launchpad.net/intltool/trunk/\([0-9][^"]*\)\/+download/intltool-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    $(SORT) -V | \
-    tail -1
-endef
-
-define $(PKG)_BUILD_$(BUILD)
-    mkdir '$(1).build'
-    cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)' man1_MANS=
-    $(MAKE) -C '$(1).build' -j 1 install man1_MANS=
-endef
diff --git a/src/isl.mk b/src/isl.mk
index 348ea33..3fe3b76 100644
--- a/src/isl.mk
+++ b/src/isl.mk
@@ -3,8 +3,8 @@
 
 PKG             := isl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.14
-$(PKG)_CHECKSUM := 7e3c02ff52f8540f6a85534f54158968417fd676001651c8289c705bd0228f36
+$(PKG)_VERSION  := 0.12.2
+$(PKG)_CHECKSUM := f4b3dbee9712850006e44f0db2103441ab3d13b406f77996d1df19ee89d11fb4
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://isl.gforge.inria.fr/$($(PKG)_FILE)
diff --git a/src/libjpeg-turbo.mk b/src/libjpeg-turbo.mk
index c4157d9..59f7210 100644
--- a/src/libjpeg-turbo.mk
+++ b/src/libjpeg-turbo.mk
@@ -22,7 +22,8 @@ define $(PKG)_BUILD
         --libdir='$(PREFIX)/$(TARGET)/lib/$(PKG)' \
         --includedir='$(PREFIX)/$(TARGET)/include/$(PKG)' \
         NASM=$(TARGET)-yasm
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' || $(MAKE) -C '$(1)' -j 1
+    $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_CRUFT)
 
     # create pkg-config file
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
diff --git a/src/libmysqlclient-1-fixes.patch b/src/libmysqlclient-1-fixes.patch
index 73611b4..5a6287e 100644
--- a/src/libmysqlclient-1-fixes.patch
+++ b/src/libmysqlclient-1-fixes.patch
@@ -337,3 +337,37 @@ index 69d19b8..738563b 100644
 -- 
 2.3.8 (Apple Git-58)
 
+
+From eb38e04f41ac341b162cfa0e97aa3ee1ce783777 Mon Sep 17 00:00:00 2001
+From: Boris Nagaev <bnagaev@gmail.com>
+Date: Wed, 11 Nov 2015 07:44:44 +0000
+Subject: [PATCH] add 'static' to some inline functions
+
+Fix https://gist.github.com/starius/71d5f276d62e58f36d2f
+See also http://stackoverflow.com/a/8502046
+
+diff --git a/include/my_global.h b/include/my_global.h
+index 8c3c3cd..3cb24f6 100644
+--- a/include/my_global.h
++++ b/include/my_global.h
+@@ -340,7 +340,7 @@ typedef socket_len_t SOCKET_SIZE_TYPE; /* Used by NDB */
+ 
+ #if (_WIN32)
+ #if !defined(_WIN64)
+-inline double my_ulonglong2double(unsigned long long value)
++static inline double my_ulonglong2double(unsigned long long value)
+ {
+   long long nr=(long long) value;
+   if (nr >= 0)
+@@ -350,7 +350,7 @@ inline double my_ulonglong2double(unsigned long long value)
+ #define ulonglong2double my_ulonglong2double
+ #define my_off_t2double  my_ulonglong2double
+ #endif /* _WIN64 */
+-inline unsigned long long my_double2ulonglong(double d)
++static inline unsigned long long my_double2ulonglong(double d)
+ {
+   double t= d - (double) 0x8000000000000000ULL;
+ 
+-- 
+2.1.4
+
diff --git a/src/libpng.mk b/src/libpng.mk
index 37de5fc..cd80af7 100644
--- a/src/libpng.mk
+++ b/src/libpng.mk
@@ -3,8 +3,8 @@
 
 PKG             := libpng
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.6.18
-$(PKG)_CHECKSUM := 2e10c13b7949883ac961db6177c516d778184432d440317e9f0391305c360963
+$(PKG)_VERSION  := 1.6.19
+$(PKG)_CHECKSUM := 311c5657f53516986c67713c946f616483e3cdb52b8b2ee26711be74e8ac35e8
 $(PKG)_SUBDIR   := libpng-$($(PKG)_VERSION)
 $(PKG)_FILE     := libpng-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/libpng/libpng16/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/librtmp.mk b/src/librtmp.mk
index e7b1a35..9f50d57 100644
--- a/src/librtmp.mk
+++ b/src/librtmp.mk
@@ -3,8 +3,8 @@
 
 PKG             := librtmp
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := a1900c3
-$(PKG)_CHECKSUM := fa4edd83cb6ed19d97f89a6d83aef6231c1bd8079aea5d33c083f827459a9ab2
+$(PKG)_VERSION  := a107cef
+$(PKG)_CHECKSUM := aea53f2a2c6596c93eeb288d97266e89a97b31795b678daccedc31d70dad28c4
 $(PKG)_SUBDIR   := mirror-rtmpdump-$($(PKG)_VERSION)
 $(PKG)_FILE     := rtmpdump-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/mirror/rtmpdump/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/libtool.mk b/src/libtool.mk
index e2c703b..713dcd7 100644
--- a/src/libtool.mk
+++ b/src/libtool.mk
@@ -8,18 +8,10 @@ $(PKG)_CHECKSUM := 159d4e20c201f929e3562536d3ae6b5e605403fa4bb4e72ef197a4e162c3f
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     := autoconf automake
+$(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://ftp.gnu.org/gnu/libtool/?C=M;O=D' | \
     $(SED) -n 's,.*<a href="libtool-\([0-9][^"]*\)\.tar.*,\1,p' | \
     head -1
 endef
-
-define $(PKG)_BUILD_$(BUILD)
-    mkdir '$(1).build'
-    cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
-endef
diff --git a/src/m4.mk b/src/m4.mk
deleted file mode 100644
index bd865cb..0000000
--- a/src/m4.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG             := m4
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.4.17
-$(PKG)_CHECKSUM := f0543c3beb51fa6b3337d8025331591e0e18d8ec2886ed391f1aade43477d508
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://ftp.gnu.org/pub/gnu/m4/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://ftp.gnu.org/pub/gnu/m4/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
-
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://ftp.gnu.org/gnu/m4/?C=M;O=D' | \
-    $(SED) -n 's,.*<a href="m4-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    $(SORT) -V | \
-    tail -1
-endef
-
-define $(PKG)_BUILD_$(BUILD)
-    # gets has been removed from recent glibc
-    $(SED) -i -e '/gets is a/d' '$(1)/lib/stdio.in.h'
-    mkdir '$(1).build'
-    cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
-endef
diff --git a/src/make.mk b/src/make.mk
deleted file mode 100644
index e8ab03c..0000000
--- a/src/make.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG             := make
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.1
-$(PKG)_CHECKSUM := 0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := http://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gettext
-
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://ftp.gnu.org/gnu/make/?C=M;O=D' | \
-    $(SED) -n 's,.*<a href="make-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    $(SORT) -V | \
-    tail -1
-endef
-
-define $(PKG)_BUILD_$(BUILD)
-    mkdir '$(1).build'
-    cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
-endef
diff --git a/src/muparser-1-fixes.patch b/src/muparser-1-fixes.patch
new file mode 100644
index 0000000..6a39160
--- /dev/null
+++ b/src/muparser-1-fixes.patch
@@ -0,0 +1,47 @@
+This file is part of MXE.
+See index.html for further information.
+
+Taken from:
+https://github.com/beltoforion/muparser/pull/17
+
+From d70b948b5ef9c854ed253f01303480b85a7bd8bd Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Sat, 21 Nov 2015 15:38:02 +1100
+Subject: [PATCH] fix dll install directory
+
+---
+ Makefile.in | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 157be77..005ada6 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -29,6 +29,7 @@ BK_DEPS = @BK_DEPS@
+ srcdir = @srcdir@
+ top_builddir = @top_builddir@
+ libdir = @libdir@
++dlldir = @dlldir@
+ DLLPREFIX = @DLLPREFIX@
+ LIBS = @LIBS@
+ AR = @AR@
+@@ -266,13 +267,14 @@ distclean: clean
+ 
+ @COND_SHARED_1@install_muParser_dll: $(__muParser_dll___depname)
+ @COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
++@COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(dlldir)
+ @COND_SHARED_1@	$(INSTALL_DATA) $(top_builddir)/lib/$(LIBPREFIX)muparser$(DEBUG_BUILD_POSTFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
+-@COND_SHARED_1@	$(INSTALL_PROGRAM) $(top_builddir)/lib/$(DLLPREFIX)muparser$(DEBUG_BUILD_POSTFIX)$(__muParser_dll___targetsuf3) $(DESTDIR)$(libdir)
++@COND_SHARED_1@	$(INSTALL_PROGRAM) $(top_builddir)/lib/$(DLLPREFIX)muparser$(DEBUG_BUILD_POSTFIX)$(__muParser_dll___targetsuf3) $(DESTDIR)$(dlldir)
+ @COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__muParser_dll___so_symlinks_inst_cmd))
+ 
+ @COND_SHARED_1@uninstall_muParser_dll: 
+ @COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)muparser$(DEBUG_BUILD_POSTFIX).$(DLLIMP_SUFFIX)
+-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)muparser$(DEBUG_BUILD_POSTFIX)$(__muParser_dll___targetsuf3)
++@COND_SHARED_1@	rm -f $(DESTDIR)$(dlldir)/$(DLLPREFIX)muparser$(DEBUG_BUILD_POSTFIX)$(__muParser_dll___targetsuf3)
+ @COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__muParser_dll___so_symlinks_uninst_cmd))
+ 
+ @COND_SHARED_1@install_muParser_dll_headers: 
+-- 
+2.4.9 (Apple Git-60)
+
diff --git a/src/muparser.mk b/src/muparser.mk
index 3783074..747cc31 100644
--- a/src/muparser.mk
+++ b/src/muparser.mk
@@ -11,18 +11,13 @@ $(PKG)_URL      := https://github.com/beltoforion/$(PKG)/archive/v$($(PKG)_VERSI
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, beltoforion/muparser) | \
-    $(SED) 's,^v,,g'
+    $(call MXE_GET_GITHUB_TAGS, beltoforion/muparser, v)
 endef
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(MXE_CONFIGURE_OPTS) \
         --disable-samples \
         --disable-debug
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
-
-$(PKG)_BUILD_SHARED =
diff --git a/src/muparserx-test.cpp b/src/muparserx-test.cpp
new file mode 100644
index 0000000..ebc6770
--- /dev/null
+++ b/src/muparserx-test.cpp
@@ -0,0 +1,48 @@
+/*
+ * This file is part of MXE.
+ * See index.html for further information.
+ *
+ * based on:
+ * http://articles.beltoforion.de/article.php?a=muparserx&hl=en&p=using&s=idInclude#idEval
+ */
+
+#include "mpParser.h"
+
+using namespace mup;
+
+int main(int argc, char *argv[])
+{
+    (void)argc;
+    (void)argv;
+
+    // Create the parser instance
+    ParserX  p;
+
+    // Create an array of mixed type
+    Value arr(3, 0);
+    arr.At(0) = 2.0;
+    arr.At(1) = "this is a string";
+
+    // Create some basic values
+    Value cVal(cmplx_type(1, 1));
+    Value sVal("Hello World");
+    Value fVal(1.1);
+
+    // Now add the variable to muParser
+    p.DefineVar("va", Variable(&arr));
+    p.DefineVar("a",  Variable(&cVal));
+    p.DefineVar("b",  Variable(&sVal));
+    p.DefineVar("c",  Variable(&fVal));
+
+    p.SetExpr("va[0]+a*strlen(b)-c");
+    for (int i=0; i<<10; ++i)
+    {
+      // evaluate the expression and change the value of
+      // the variable c in each turn
+      cVal = 1.1 * i;
+      Value result = p.Eval();
+
+      // print the result
+      console() << result << "\n";
+    }
+}
diff --git a/src/muparserx.mk b/src/muparserx.mk
new file mode 100644
index 0000000..34f22b1
--- /dev/null
+++ b/src/muparserx.mk
@@ -0,0 +1,26 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := muparserx
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 4.0.4
+$(PKG)_CHECKSUM := d7ebcab8cb1de88e6dcba21651db8f6055b3e904c45afc387b06b5f4218dda40
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_URL      := https://github.com/beltoforion/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
+$(PKG)_DEPS     := gcc
+
+define $(PKG)_UPDATE
+    $(call MXE_GET_GITHUB_TAGS, beltoforion/muparserx, v)
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && '$(TARGET)-cmake' \
+        -DBUILD_EXAMPLES=OFF
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+
+    '$(TARGET)-g++' \
+        -W -Wall -Werror -ansi -pedantic \
+        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        `'$(TARGET)-pkg-config' $(PKG) --cflags --libs`
+endef
diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk
index 558d307..9adc685 100644
--- a/src/mxe-conf.mk
+++ b/src/mxe-conf.mk
@@ -62,9 +62,6 @@ define $(PKG)_BUILD
              > '$(PREFIX)/bin/$(TARGET)-cmake'
     chmod 0755 '$(PREFIX)/bin/$(TARGET)-cmake'
 
-    #create readonly directory to force wine to fail
-    $(INSTALL) -m444 -d "$$WINEPREFIX"
-
     # create pkg-config files for OpenGL/GLU
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
     (echo 'Name: gl'; \
@@ -72,7 +69,6 @@ define $(PKG)_BUILD
      echo 'Description: OpenGL'; \
      echo 'Libs: -lopengl32';) \
      > '$(PREFIX)/$(TARGET)/lib/pkgconfig/gl.pc'
-
     (echo 'Name: glu'; \
      echo 'Version: 0'; \
      echo 'Description: OpenGL'; \
@@ -101,4 +97,15 @@ define $(PKG)_BUILD_$(BUILD)
      > '$(1)/configure.ac'
     cd '$(1)' && autoreconf -fiv
     cd '$(1)' && ./configure
+
+    #create readonly directory to force wine to fail
+    $(INSTALL) -m444 -d "$$WINEPREFIX"
+
+    #create script "wine" in a directory which is in PATH
+    mkdir -p '$(PREFIX)/$(BUILD)/bin/'
+    (echo '#!/usr/bin/env bash'; \
+     echo 'exit 1'; \
+    ) \
+             > '$(PREFIX)/$(BUILD)/bin/wine'
+    chmod 0755 '$(PREFIX)/$(BUILD)/bin/wine'
 endef
diff --git a/src/pire.mk b/src/pire.mk
index a9b8dfc..49b87a2 100644
--- a/src/pire.mk
+++ b/src/pire.mk
@@ -11,8 +11,7 @@ $(PKG)_URL      := https://github.com/yandex/pire/archive/release-$($(PKG)_VERSI
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, yandex/pire) | \
-    $(SED) 's,^release-,,g'
+    $(call MXE_GET_GITHUB_TAGS, yandex/pire, release-)
 endef
 
 define $(PKG)_BUILD
diff --git a/src/sed.mk b/src/sed.mk
deleted file mode 100644
index 8351361..0000000
--- a/src/sed.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG             := sed
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.2.2
-$(PKG)_CHECKSUM := f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := http://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gettext libiconv
-
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://ftp.gnu.org/gnu/sed/?C=M;O=D' | \
-    $(SED) -n 's,.*<a href="sed-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    $(SORT) -V | \
-    tail -1
-endef
-
-define $(PKG)_BUILD_$(BUILD)
-    mkdir '$(1).build'
-    cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)' man1_MANS=
-    $(MAKE) -C '$(1).build' -j 1 install man1_MANS=
-endef
diff --git a/src/vmime.mk b/src/vmime.mk
index 247dc68..0eb7b36 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -3,8 +3,8 @@
 
 PKG             := vmime
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 7e36a74
-$(PKG)_CHECKSUM := 4b73f0f30e37f9134fb5157aca3576ca29036262d379aaffcce3a443a2f271ee
+$(PKG)_VERSION  := b0c8d21
+$(PKG)_CHECKSUM := b436d2dd7c5c2b6948db3d8cbaa0f0868e0550808446c9a9bb131b54738b2bab
 $(PKG)_SUBDIR   := kisli-vmime-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/widl.mk b/src/widl.mk
index 1c7375b..c0ef1fa 100644
--- a/src/widl.mk
+++ b/src/widl.mk
@@ -24,7 +24,7 @@ define $(PKG)_BUILD
         --prefix='$(PREFIX)' \
         --target='$(TARGET)'
     $(MAKE) -C '$(1)/mingw-w64-tools/widl' -j '$(JOBS)' install
-	
+
     # create cmake file
     echo 'set(CMAKE_WIDL $(PREFIX)/bin/$(TARGET)-$(PKG) CACHE PATH "widl executable")' \
     > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake'