Imported recent updates in Maneage, minor conflicts fixed

Some very minor conflicts came up and were easily corrected. They were
mostly in parts that are also shared with the demonstration in the core
Maneage branch.

1 files changed, 16 insertions, 15 deletions

diff --git a/reproduce/software/config/urls.conf b/reproduce/software/config/urls.conf
index 945537d..34c4d89 100644
--- a/reproduce/software/config/urls.conf
+++ b/reproduce/software/config/urls.conf
@@ -16,8 +16,8 @@
 
 
 # Basic/low-level programs and libraires (installed in any case)
-# --------------------------------------------------------------
-#bash-url = http://akhlaghi.org/maneage-software
+# -------------------------------------------------------------
+#bash-url = http://akhlaghi.org/src
 #binutils-url = http://ftp.gnu.org/gnu/binutils
 #bzip2-url = http://akhlaghi.org/maneage-software
 #cert-url = http://akhlaghi.org/maneage-software
@@ -86,7 +86,7 @@
 #cairo-url = https://www.cairographics.org/releases
 #cdsclient-url = http://cdsarc.u-strasbg.fr/ftp/pub/sw
 #cfitsio-url = https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c
-#cmake-url = $(shell majv=$$(echo $(cmake-version) | sed -e's/\./ /' | awk '{printf("%d.%d", $$1, $$2)}'); echo https://cmake.org/files/v$$majv/cmake-$(cmake-version).tar.gz)
+#cmake-url = $(shell majv=$$(echo $(cmake-version) | sed -e's/\./ /' | awk '{printf("%d.%d", $$1, $$2)}'); echo https://cmake.org/files/v$$majv)
 #eigen-url = http://bitbucket.org/eigen/eigen/get/$(eigen-version).tar.gz
 #expat-url = $(shell vstr=$$(echo $(expat-version) | sed -e's/\./_/g'); echo https://github.com/libexpat/libexpat/releases/download/R_$$vstr/expat-$(expat-version).tar.lz)
 #fftw-url = ftp://ftp.fftw.org/pub/fftw
@@ -94,22 +94,23 @@
 #freetype-url = https://download.savannah.gnu.org/releases/freetype
 #gdb-url = http://ftp.gnu.org/gnu/gdb
 #ghostscript-url = $(shell v=$$(echo $(ghostscript-version) | sed -e's/\.//'); echo https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$$v)
-#gs-fonts-std-url = https://downloads.sourceforge.net/gs-fonts
-#gs-fonts-gnu-url = https://downloads.sourceforge.net/gs-fonts
 #gnuastro-url = http://ftp.gnu.org/gnu/gnuastro
+#gperf-url = http://ftp.gnu.org/pub/gnu/gperf
+#gs-fonts-gnu-url = https://downloads.sourceforge.net/gs-fonts
+#gs-fonts-std-url = https://downloads.sourceforge.net/gs-fonts
 #gsl-url = http://ftp.gnu.org/gnu/gsl
 #hdf5-url = $(shell majorver=$$(echo $(hdf5-version) | sed -e 's/\./ /g' | awk '{printf("%d.%d", $$1, $$2)}'); echo https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-$$majorver/hdf5-$(hdf5-version)/src)
 #healpix-url = http://akhlaghi.org/maneage-software
 #help2man-url = http://ftp.gnu.org/gnu/help2man
+#ibpaper-url=http://ftp.debian.org/debian/pool/main/libp/libpaper/
 #imagemagick-url = http://akhlaghi.org/maneage-software
 #imfit-url = http://www.mpe.mpg.de/~erwin/resources/imfit
 #lapack-url = http://www.netlib.org/lapack
 #libffi-url = ftp://sourceware.org/pub/libffi
+#libgit2-url = http://akhlaghi.org/src
 #libidn-url = https://ftp.gnu.org/gnu/libidn
-#libgit2-url = https://github.com/libgit2/libgit2/archive
 #libjpeg-url = http://ijg.org/files
 #libnsl-url = http://akhlaghi.org/maneage-software
-#ibpaper-url=http://ftp.debian.org/debian/pool/main/libp/libpaper/
 #libpng-url = https://download.sourceforge.net/libpng
 #libtiff-url = https://download.osgeo.org/libtiff
 #libtirpc-url = https://downloads.sourceforge.net/libtirpc
@@ -121,7 +122,7 @@
 #openssh-url = https://artfiles.org/openbsd/OpenSSH/portable
 #patch-url = http://ftp.gnu.org/gnu/patch
 #pixman-url = https://www.cairographics.org/releases
-#python-url = https://www.python.org/ftp/python/$(python-version)
+#python-url = http://akhlaghi.org/src
 #R-url = $(shell majver=$$(echo $(R-version) | sed -e's/\./ /g' | awk '{print $$1}'); echo https://cran.r-project.org/src/base/R-$$majver)
 #rpcsvc-proto-url = https://github.com/thkukuk/rpcsvc-proto/releases/download
 #scamp-url = http://akhlaghi.org/maneage-software
@@ -138,16 +139,16 @@
 
 # Xorg packages
 # -------------
-#util-macros-url = https://www.x.org/pub/individual/util
-#xorgproto-url = https://xorg.freedesktop.org/archive/individual/proto
+#fontconfig-url = https://www.freedesktop.org/software/fontconfig/release
+#libpthread-stubs-url = https://xcb.freedesktop.org/dist
+#libx11-url = https://www.x.org/pub/individual/lib
 #libxau-url = https://www.x.org/pub/individual/lib
 #libxdmcp-url = https://www.x.org/pub/individual/lib
+#libxext-url = https://www.x.org/pub/individual/lib
+#util-macros-url = https://www.x.org/pub/individual/util
 #xcb-proto-url = https://xorg.freedesktop.org/archive/individual/proto
-#fontconfig-url = https://www.freedesktop.org/software/fontconfig/release
+#xorgproto-url = https://xorg.freedesktop.org/archive/individual/proto
 #xtrans-url = https://www.x.org/pub/individual/lib
-#libx11-url = https://www.x.org/pub/individual/lib
-#libxext-url = https://www.x.org/pub/individual/lib
-#libpthread-stubs-url = https://xcb.freedesktop.org/dist
 
 
 
@@ -167,7 +168,7 @@
 # files" menu, you can download the source '.zip' file. For version 1.18.5,
 # (with full filename of 'numpy-1.18.5.zip') the link will be like this.
 #
-#  numpy-url = https://files.pythonhosted.org/packages/01/1b/d3ddcabd5817be02df0e6ee20d64f77ff6d0d97f83b77f65e98c8a651981/numpy-1.18.5.zip
+#  numpy-url = https://files.pythonhosted.org/packages/01/1b/d3ddcabd5817be02df0e6ee20d64f77ff6d0d97f83b77f65e98c8a651981
 #
 # Hence, if the version changes, the checksum, and its two top host
 # directories also change. This is why we aren't putting any URL here by