update packages armadillo cfitsio imagemagick libgsf ocaml-findlib

7 files changed, 10 insertions, 224 deletions

diff --git a/index.html b/index.html
index 8df22bb..69ff4c1 100644
--- a/index.html
+++ b/index.html
@@ -974,7 +974,7 @@ aptitude -t squeeze-backports install cmake yasm</pre>
     </tr>
     <tr>
         <td id="armadillo-package">armadillo</td>
-        <td id="armadillo-version">3.900.5</td>
+        <td id="armadillo-version">3.900.6</td>
         <td id="armadillo-website"><a href="http://arma.sourceforge.net/">Armadillo C++ linear algebra library</a></td>
     </tr>
     <tr>
@@ -1039,7 +1039,7 @@ aptitude -t squeeze-backports install cmake yasm</pre>
     </tr>
     <tr>
         <td id="cfitsio-package">cfitsio</td>
-        <td id="cfitsio-version">3340</td>
+        <td id="cfitsio-version">3350</td>
         <td id="cfitsio-website"><a href="http://heasarc.gsfc.nasa.gov/fitsio/">cfitsio</a></td>
     </tr>
     <tr>
@@ -1369,7 +1369,7 @@ aptitude -t squeeze-backports install cmake yasm</pre>
     </tr>
     <tr>
         <td id="imagemagick-package">imagemagick</td>
-        <td id="imagemagick-version">6.8.6-1</td>
+        <td id="imagemagick-version">6.8.6-2</td>
         <td id="imagemagick-website"><a href="http://www.imagemagick.org/">ImageMagick</a></td>
     </tr>
     <tr>
@@ -1509,7 +1509,7 @@ aptitude -t squeeze-backports install cmake yasm</pre>
     </tr>
     <tr>
         <td id="libgsf-package">libgsf</td>
-        <td id="libgsf-version">1.14.26</td>
+        <td id="libgsf-version">1.14.27</td>
         <td id="libgsf-website"><a href="http://projects.gnome.org/libgsf/">libgsf</a></td>
     </tr>
     <tr>
@@ -1789,7 +1789,7 @@ aptitude -t squeeze-backports install cmake yasm</pre>
     </tr>
     <tr>
         <td id="ocaml-findlib-package">ocaml-findlib</td>
-        <td id="ocaml-findlib-version">1.3.3</td>
+        <td id="ocaml-findlib-version">1.4</td>
         <td id="ocaml-findlib-website"><a href="http://download.camlcity.org/">findlib</a></td>
     </tr>
     <tr>
diff --git a/src/armadillo.mk b/src/armadillo.mk
index 8f4f675..b57f67f 100644
--- a/src/armadillo.mk
+++ b/src/armadillo.mk
@@ -4,7 +4,7 @@
 # armadillo
 PKG             := armadillo
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 80eb4e6e56a6949532b4ac946a933ad64c203e40
+$(PKG)_CHECKSUM := d9ad6af0ea9440cfd78eacba990c0512bd17f19c
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/arma/$($(PKG)_FILE)
diff --git a/src/cfitsio-1-ar.patch b/src/cfitsio-1-ar.patch
deleted file mode 100644
index 07eb5b1..0000000
--- a/src/cfitsio-1-ar.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Submitted upstream by mail since this package has no bug tracking system.
-
---- cfitsio.orig/configure	2013-03-20 21:02:48.000000000 +0100
-+++ cfitsio/configure	2013-03-24 02:49:59.195998683 +0100
-@@ -614,6 +614,8 @@
- GREP
- CPP
- RANLIB
-+ac_ct_AR
-+AR
- FC
- OBJEXT
- EXEEXT
-@@ -3136,6 +3138,170 @@
-   fi
- fi
- 
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+
-+
-+if test -n "$ac_tool_prefix"; then
-+  for ac_prog in ar lib "link -lib"
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_AR+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$AR"; then
-+  ac_cv_prog_AR="$AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-+$as_echo "$AR" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+    test -n "$AR" && break
-+  done
-+fi
-+if test -z "$AR"; then
-+  ac_ct_AR=$AR
-+  for ac_prog in ar lib "link -lib"
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_ac_ct_AR+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_AR"; then
-+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_AR="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$ac_ct_AR" && break
-+done
-+
-+  if test "x$ac_ct_AR" = x; then
-+    AR="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    AR=$ac_ct_AR
-+  fi
-+fi
-+
-+: ${AR=ar}
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
-+$as_echo_n "checking the archiver ($AR) interface... " >&6; }
-+if ${am_cv_ar_interface+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  am_cv_ar_interface=ar
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+int some_variable = 0;
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
-+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
-+  (eval $am_ar_try) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+      if test "$ac_status" -eq 0; then
-+        am_cv_ar_interface=ar
-+      else
-+        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
-+        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
-+  (eval $am_ar_try) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+        if test "$ac_status" -eq 0; then
-+          am_cv_ar_interface=lib
-+        else
-+          am_cv_ar_interface=unknown
-+        fi
-+      fi
-+      rm -f conftest.lib libconftest.a
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
-+$as_echo "$am_cv_ar_interface" >&6; }
-+
-+case $am_cv_ar_interface in
-+ar)
-+  ;;
-+lib)
-+  # Microsoft lib, so override with the ar-lib wrapper script.
-+  # FIXME: It is wrong to rewrite AR.
-+  # But if we don't then we get into trouble of one sort or another.
-+  # A longer-term fix would be to have automake use am__AR in this case,
-+  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
-+  # similar.
-+  AR="$am_aux_dir/ar-lib $AR"
-+  ;;
-+unknown)
-+  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
-+  ;;
-+esac
-+
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-@@ -3229,7 +3395,6 @@
- fi
- 
- 
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
---- cfitsio.orig/Makefile.in	2013-03-20 20:53:22.000000000 +0100
-+++ cfitsio/Makefile.in	2013-03-24 02:42:38.055988617 +0100
-@@ -27,6 +27,7 @@
- 
- 
- SHELL =		/bin/sh
-+AR =		@AR@
- RANLIB =	@RANLIB@
- CC =		@CC@
- CFLAGS =	@CFLAGS@
-@@ -81,7 +82,7 @@
- stand_alone:	libcfitsio.a
- 
- libcfitsio.a:	${OBJECTS}
--		ar rv libcfitsio.a ${OBJECTS}; \
-+		${AR} rv libcfitsio.a ${OBJECTS}; \
- 		${RANLIB} libcfitsio.a;
- 
- shared: libcfitsio${SHLIB_SUFFIX}
diff --git a/src/cfitsio.mk b/src/cfitsio.mk
index cba7ef5..14a41b0 100644
--- a/src/cfitsio.mk
+++ b/src/cfitsio.mk
@@ -3,7 +3,7 @@
 
 PKG             := cfitsio
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 9b6f61bbc0528662134d05f9d84dfe88db9df9b2
+$(PKG)_CHECKSUM := ce39f428557d418d72dd6241c9626ea76109ba08
 $(PKG)_SUBDIR   := cfitsio
 $(PKG)_FILE     := cfitsio$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/$($(PKG)_FILE)
diff --git a/src/imagemagick.mk b/src/imagemagick.mk
index ca94da6..14b7c78 100644
--- a/src/imagemagick.mk
+++ b/src/imagemagick.mk
@@ -3,7 +3,7 @@
 
 PKG             := imagemagick
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 0b175bf5bb7165ed3e677b4df3094e952ba3043e
+$(PKG)_CHECKSUM := 58b09b94a59457a7c82a4db9cc29e9a5718129a2
 $(PKG)_SUBDIR   := ImageMagick-$($(PKG)_VERSION)
 $(PKG)_FILE     := ImageMagick-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://www.imagemagick.org/download/$($(PKG)_FILE)
diff --git a/src/libgsf.mk b/src/libgsf.mk
index f4b69b3..96ff29a 100644
--- a/src/libgsf.mk
+++ b/src/libgsf.mk
@@ -3,7 +3,7 @@
 
 PKG             := libgsf
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 53aee5be12e512a565167b2e663d12d65b5db8d9
+$(PKG)_CHECKSUM := b6082b71bf9d6e1cdafde9628cae58fcedc4a8fd
 $(PKG)_SUBDIR   := libgsf-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgsf-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/libgsf/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
diff --git a/src/ocaml-findlib.mk b/src/ocaml-findlib.mk
index 535695e..1f02d3f 100644
--- a/src/ocaml-findlib.mk
+++ b/src/ocaml-findlib.mk
@@ -3,7 +3,7 @@
 
 PKG             := ocaml-findlib
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 5d1a52b77145348ded29fefe13736694aabb1868
+$(PKG)_CHECKSUM := 07048076758e4ca892f06ff535d7cab033833bde
 $(PKG)_SUBDIR   := findlib-$($(PKG)_VERSION)
 $(PKG)_FILE     := findlib-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://download.camlcity.org/download/$($(PKG)_FILE)