5 files changed, 43 insertions, 13 deletions

diff --git a/science/abinit/files/patch-Makefile.in b/science/abinit/files/patch-Makefile.in
deleted file mode 100644
index 05da3e07cc89..000000000000
--- a/science/abinit/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2018-06-14 05:16:42 UTC
-+++ Makefile.in
-@@ -876,7 +876,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
-   @abi_ac_distcheck@ \
-   PYFLAGS="@PYFLAGS@ -B"
- 
--SUBDIRS = fallbacks src abichecks tests
-+SUBDIRS = fallbacks src abichecks
- 
- # Additional files to clean
- CLEANFILES = config.optim config.fc_info.tmp
diff --git a/science/abinit/files/patch-config_m4_sd__levmar.m4 b/science/abinit/files/patch-config_m4_sd__levmar.m4
new file mode 100644
index 000000000000..679358a6ee71
--- /dev/null
+++ b/science/abinit/files/patch-config_m4_sd__levmar.m4
@@ -0,0 +1,10 @@
+--- config/m4/sd_levmar.m4.orig	2020-11-10 12:21:53 UTC
++++ config/m4/sd_levmar.m4
+@@ -239,6 +239,7 @@ AC_DEFUN([_SD_LEVMAR_CHECK_USE], [
+   AC_LANG_PUSH([C])
+   AC_LINK_IFELSE([AC_LANG_PROGRAM(
+     [[
++#     include <stddef.h>
+ #     include <levmar.h>
+ 
+       void dfit_function(double *p, double *y, int m, int n, void *adata)
diff --git a/science/abinit/files/patch-config_scripts_makemake b/science/abinit/files/patch-config_scripts_makemake
new file mode 100644
index 000000000000..ee97e9a3e4df
--- /dev/null
+++ b/science/abinit/files/patch-config_scripts_makemake
@@ -0,0 +1,11 @@
+--- config/scripts/makemake.orig	2020-12-26 16:36:41 UTC
++++ config/scripts/makemake
+@@ -408,7 +408,7 @@ if ( opts.run_clean ):
+   sys.exit(0)
+ 
+ # Get Autotools versions
+-(m4_ret, m4_version) = getstatusoutput("m4 --version | sed 's/o/ /g' ")
++(m4_ret, m4_version) = getstatusoutput("gm4 --version | sed 's/o/ /g' ")
+ (ac_ret, ac_version) = getstatusoutput("autoconf --version")
+ (am_ret, am_version) = getstatusoutput("automake --version")
+ (lt_ret, lt_version) = getstatusoutput("libtool  --version")
diff --git a/science/abinit/files/patch-src_02__clib_md5.c b/science/abinit/files/patch-shared__common__src__02_clib__md5.c
index f40bca3c14f3..16408c671ee0 100644
--- a/science/abinit/files/patch-src_02__clib_md5.c
+++ b/science/abinit/files/patch-shared__common__src__02_clib__md5.c
@@ -1,5 +1,5 @@
---- src/02_clib/md5.c.orig	2017-02-28 12:02:53 UTC
-+++ src/02_clib/md5.c
+--- shared/common/src/02_clib/md5.c.orig	2017-02-28 12:02:53 UTC
++++ shared/common/src/02_clib/md5.c
 @@ -47,7 +47,7 @@
  #ifdef HAVE_MALLOC_MALLOC_H
  #  include <malloc/malloc.h>
diff --git a/science/abinit/files/patch-shared_common_src_02__clib_calling__levmar.c b/science/abinit/files/patch-shared_common_src_02__clib_calling__levmar.c
new file mode 100644
index 000000000000..3e4cdda53c61
--- /dev/null
+++ b/science/abinit/files/patch-shared_common_src_02__clib_calling__levmar.c
@@ -0,0 +1,20 @@
+--- shared/common/src/02_clib/calling_levmar.c.orig	2020-11-10 12:21:53 UTC
++++ shared/common/src/02_clib/calling_levmar.c
+@@ -150,7 +150,7 @@ double opts[LM_OPTS_SZ], info[LM_INFO_SZ];
+       /* invoke the optimisation function with box boundaries*/
+       ret=dlevmar_bc_dif(dim_screening, coeffs, yvals, c_ncoeffs, c_nvals, \
+            lower_bounds, upper_bounds, 3000, opts, info, NULL, NULL, \
+-           (void *)&adata); // Box boundary conditions without Jacobian
++           NULL, (void *)&adata); // Box boundary conditions without Jacobian
+     //}
+   //}
+   
+@@ -220,7 +220,7 @@ double opts[LM_OPTS_SZ], info[LM_INFO_SZ];
+       /* invoke the optimisation function with box boundaries*/
+       ret=dlevmar_bc_dif(dre_and_im_screening, coeffs, yvals, c_ncoeffs, c_nvals, \
+            lower_bounds, upper_bounds, 1000, opts, info, NULL, NULL, \
+-           (void *)&adata); // Box boundary conditions without Jacobian
++           NULL, (void *)&adata); // Box boundary conditions without Jacobian
+     //}
+   //}
+