diff --git a/src/ocaml-cairo.mk b/src/ocaml-cairo.mk
index e37bc2f4..6959c7df 100644
--- a/src/ocaml-cairo.mk
+++ b/src/ocaml-cairo.mk
@@ -1,14 +1,13 @@
 # This file is part of MXE.
 # See index.html for further information.
 
-PKG                := ocaml-cairo
-$(PKG)_IGNORE    :=
+PKG             := ocaml-cairo
+$(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := d5835620bea005d5d5239f889b10a922fda2520b
-$(PKG)_SUBDIR    := cairo-ocaml-$($(PKG)_VERSION)
-$(PKG)_FILE        := cairo-ocaml_$($(PKG)_VERSION).orig.tar.gz
-# URL http://cgit.freedesktop.org/cairo-ocaml/snapshot/$($(PKG)_FILE) gives a different checksum at each download, so I use the debian version.
-$(PKG)_URL        := http://ftp.de.debian.org/debian/pool/main/c/cairo-ocaml/$($(PKG)_FILE)
-$(PKG)_DEPS        := ocaml-core ocaml-findlib ocaml-lablgtk2
+$(PKG)_SUBDIR   := cairo-ocaml-$($(PKG)_VERSION)
+$(PKG)_FILE     := cairo-ocaml_$($(PKG)_VERSION).orig.tar.gz
+$(PKG)_URL      := http://ftp.de.debian.org/debian/pool/main/c/cairo-ocaml/$($(PKG)_FILE)
+$(PKG)_DEPS     := ocaml-core ocaml-findlib ocaml-lablgtk2
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://ftp.de.debian.org/debian/pool/main/c/cairo-ocaml' | \
diff --git a/src/ocaml-camlimages.mk b/src/ocaml-camlimages.mk
index 054238b0..64df010b 100644
--- a/src/ocaml-camlimages.mk
+++ b/src/ocaml-camlimages.mk
@@ -1,13 +1,13 @@
 # This file is part of MXE.
 # See index.html for further information.
 
-PKG                := ocaml-camlimages
-$(PKG)_IGNORE    :=
+PKG             := ocaml-camlimages
+$(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := 3ff44142386970003d3cff1446ad351b36759a8e
-$(PKG)_SUBDIR    := camlspotter-camlimages-c803efa9d5d3
-$(PKG)_FILE        := v$($(PKG)_VERSION).tar.gz
-$(PKG)_URL        := https://bitbucket.org/camlspotter/camlimages/get/v$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS        := ocaml-findlib freetype libpng giflib tiff ocaml-lablgtk2
+$(PKG)_SUBDIR   := camlspotter-camlimages-c803efa9d5d3
+$(PKG)_FILE     := v$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://bitbucket.org/camlspotter/camlimages/get/v$($(PKG)_VERSION).tar.gz
+$(PKG)_DEPS     := ocaml-findlib freetype libpng giflib tiff ocaml-lablgtk2
 
 define $(PKG)_UPDATE
     wget -q -O- 'https://bitbucket.org/camlspotter/camlimages/downloads' | \
diff --git a/src/ocaml-findlib.mk b/src/ocaml-findlib.mk
index 9fca3622..e0c9d3ed 100644
--- a/src/ocaml-findlib.mk
+++ b/src/ocaml-findlib.mk
@@ -1,13 +1,13 @@
 # This file is part of mingw-cross-env.
 # See doc/index.html for further information.
 
-PKG                := ocaml-findlib
-$(PKG)_IGNORE    :=
+PKG             := ocaml-findlib
+$(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := 5d1a52b77145348ded29fefe13736694aabb1868
-$(PKG)_SUBDIR    := findlib-$($(PKG)_VERSION)
-$(PKG)_FILE        := findlib-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL        := http://download.camlcity.org/download/$($(PKG)_FILE)
-$(PKG)_DEPS        := ocaml-core
+$(PKG)_SUBDIR   := findlib-$($(PKG)_VERSION)
+$(PKG)_FILE     := findlib-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://download.camlcity.org/download/$($(PKG)_FILE)
+$(PKG)_DEPS     := ocaml-core
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://download.camlcity.org/download' | \
@@ -20,14 +20,14 @@ define $(PKG)_BUILD
     # build
     rm -f $(1)/src/findlib/ocaml_args.ml
     cd '$(1)' && \
-      PATH="$(PREFIX)/$(TARGET)/bin/ocaml-native:$(PATH)" \
-      ./configure \
-      -config $(PREFIX)/$(TARGET)/etc/findlib.conf \
-      -bindir $(PREFIX)/$(TARGET)/bin \
-      -sitelib $(PREFIX)/$(TARGET)/lib/ocaml \
-      -mandir $(PREFIX)/$(TARGET)/share/man \
-      -with-toolbox \
-      -no-topfind \
+        PATH="$(PREFIX)/$(TARGET)/bin/ocaml-native:$(PATH)" \
+        ./configure \
+            -config $(PREFIX)/$(TARGET)/etc/findlib.conf \
+            -bindir $(PREFIX)/$(TARGET)/bin \
+            -sitelib $(PREFIX)/$(TARGET)/lib/ocaml \
+            -mandir $(PREFIX)/$(TARGET)/share/man \
+            -with-toolbox \
+            -no-topfind
 
     # no-topfind because it wants to be installed in /usr/bin, and creates blocking
     # error
diff --git a/src/ocaml-lablgl.mk b/src/ocaml-lablgl.mk
index 239a16fa..80aef063 100644
--- a/src/ocaml-lablgl.mk
+++ b/src/ocaml-lablgl.mk
@@ -1,13 +1,13 @@
 # This file is part of mingw-cross-env.
 # See doc/index.html for further information.
 
-PKG                := ocaml-lablgl
-$(PKG)_IGNORE    :=
+PKG             := ocaml-lablgl
+$(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := 996f0aba788f5fa1531587fb06d667b94237cc92
-$(PKG)_SUBDIR    := lablGL
-$(PKG)_FILE        := lablgl-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL        := http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/$($(PKG)_FILE)
-$(PKG)_DEPS        := ocaml-findlib gtkglarea
+$(PKG)_SUBDIR   := lablGL
+$(PKG)_FILE     := lablgl-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/$($(PKG)_FILE)
+$(PKG)_DEPS     := ocaml-findlib gtkglarea
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html' | \