Imported some recent/parallel work, conflicts fixed

Especially because of the new convention regarding backslashes, there were
many conflicts that are now fixed. But none were substantial.

3 files changed, 6 insertions, 4 deletions

diff --git a/reproduce/software/config/installation/TARGETS.mk b/reproduce/software/config/installation/TARGETS.mk
index 4b1ff2e..b9157f1 100644
--- a/reproduce/software/config/installation/TARGETS.mk
+++ b/reproduce/software/config/installation/TARGETS.mk
@@ -1,6 +1,7 @@
 # Necessary high-level software to build in this project.
 #
 # Copyright (C) 2018-2019 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+# Copyright (C) 2019 Raul Infante-Sainz <infantesainz@gmail.com>
 #
 # Copying and distribution of this file, with or without modification, are
 # permitted in any medium without royalty provided the copyright notice and
diff --git a/reproduce/software/config/installation/numpy-scipy.cfg b/reproduce/software/config/installation/numpy-scipy.cfg
index 4b7a7b0..03038ed 100644
--- a/reproduce/software/config/installation/numpy-scipy.cfg
+++ b/reproduce/software/config/installation/numpy-scipy.cfg
@@ -8,6 +8,7 @@
 # should leave out sections that your package does not use.
 #
 # Copyright (C) 2018-2019 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+# Copyright (C) 2019 Raul Infante-Sainz <infantesainz@gmail.com>
 #
 # Copying and distribution of this file, with or without modification, are
 # permitted in any medium without royalty provided the copyright notice and
diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk
index df2b4fa..5c7743d 100644
--- a/reproduce/software/config/installation/versions.mk
+++ b/reproduce/software/config/installation/versions.mk
@@ -83,10 +83,10 @@ gsl-version                = 2.5
 hdf5-version               = 1.10.5
 libffi-version             = 3.2.1
 libjpeg-version            = v9b
+libpng-version             = 1.6.37
 libtiff-version            = 4.0.10
 libtool-version            = 2.4.6
 libxml2-version            = 2.9.9
-netpbm-version             = 10.47.72
 openblas-version           = 0.3.5
 openmpi-version            = 4.0.1
 pixman-version             = 0.38.0
@@ -159,8 +159,8 @@ webencodings-version       = 0.5.1
 # during their build and must be accounted for.
 #
 # Special notes:
-#   - `libpng' is downgraded: the current installation of `netpbm' requires
-#     a version less than 1.5.
+#   - `netpbm' questions in the configure steps maybe change with different
+#   or new versions.
 
 # Basic/low-level
 bzip2-version              = 1.0.6
@@ -168,5 +168,5 @@ bzip2-version              = 1.0.6
 # Optional/high-level
 lapack-version             = 3.8.0
 libgit2-version            = 0.26.0
-libpng-version             = 1.4.22
+netpbm-version             = 10.86.99
 wcslib-version             = 6.2