GNU Bison, GNU Help2man and Flex are now available

With this commit these three software packages are now installable with
this template.

3 files changed, 26 insertions, 3 deletions

diff --git a/reproduce/software/config/installation/checksums.mk b/reproduce/software/config/installation/checksums.mk
index e23d044..6c12712 100644
--- a/reproduce/software/config/installation/checksums.mk
+++ b/reproduce/software/config/installation/checksums.mk
@@ -75,16 +75,19 @@ zlib-checksum = 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff
 # suffix from the list below.
 astrometrynet-checksum = 35c268bf0a7068e01323b9bfccdf255c993df83c24b2e6026a00084c4ab87d031f1024205d0ed3aecc7e2a495d4bc0b0e67270d66679020b7cc2e4b2f30f5c4a
 atlas-checksum = bf17306f09f2aa973cb776e2c9eacfb2409ad4d95d19802e1c4e0597d0a099fccdb5eaafe273c2682a41e41a3c6fabc8bbba4ce03180cffea40ede5df1d1f56e
+bison-checksum = 00d2b37187b93100ec4b220ce2752d12ccf68f9d0d39b380d375d36dd8a22aa1d6e60156918f95e4493f9531c5d42d8fad38fd807307b491c1ca7ca4177823d9
 cairo-checksum = 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
 cdsclient-checksum = 2d7abf0079189b9dd19cb8919061445fd19ea9f7dfd54e8ceee26b743218cf62ab00eba0147abe82d9294223927f04b4cc3328620dfc9184a7049f8d515b29e4
 cfitsio-checksum = c0502699e266928dd25abe57730dc4b357ccc9023789fe745324ae01aa688516aceaf37321ee578f0430111d9718f0fec0dc5b54c07f935529560f00b32ce1e3
 cmake-checksum = 7d0abf2f7c661c6b555a7e93a2fce5ab5610c653b0aa4949bed6e97bfbe6523fd0665f67115d3944d3729cbe07ae3aaf780ee673b06dd80f90018cec8a999658
 fftw-checksum = ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
+flex-checksum = e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e
 freetype-checksum = 02f0f4211f9cee5b5e46ebe61190482fca5b41bc26be06fcf0d2d717e9fb119229308398c420eeea476fa2511ca2d52948f1a3242efad30ca82ed0b07cd50e3a
 ghostscript-checksum = 9ad7bd24b6d9b7d258e943783817be036a2e0234517baffa1016804ef9b6f3062fb5da20a890a0bfc9e58203ddcf25dc4465f5b3bf5e4a61db87bef0606a0884
 gnuastro-checksum = 6ff8e86f2834a08acf94295ae022736a3f31afd3c66c0d74b012d98e53c2184c42d6d4558997a85b268c5e3ebb258041fe2db2478435788b26c0b94068dd892e
 gsl-checksum = 0be8240715f0b86aba2c63d9f12da4dba4719d4e350e9308d279e0dd3b2f0519ea26fd2e38a17f3e8cf43aacbaa2455207a7ca0d6c305f3b8725e8ece2250a74
 hdf5-checksum = f828ee9d63533effe1ad358230e5ce7b64c5016e49291d9533575f713cbfba496290fc0151fd9617898bdf36785984ddb38a9207f529d7702d4e23838fe050d8
+help2man-checksum = 786a6bd4336c591cfeb0b4f2dc1429f6545e36514e7b238453c91368b8f531c46db2be025f02dc52e6dd8b971d6edbb4ff1a8e1b519f9253a3957ad7157790be
 imagemagick-checksum = ad4325df57769f9c4edf8ac71370cb9bb19e090e588d47eb0311e3f4895abd7a7edcbd2e7a495f21acd1daca97fa224bdf1fd978577588e45c11a7799c3d67f4
 imfit-checksum = 15edd2349232c1c8e611b31d3a46b0700112d274515f54d0a0085bb4bfa6d3d5f8a15cd926516e043a29ce841accf3534ae58dbfb952d858dc9445199c957096
 lapack-checksum = 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk
index a8cd5e2..3002078 100644
--- a/reproduce/software/config/installation/versions.mk
+++ b/reproduce/software/config/installation/versions.mk
@@ -73,17 +73,20 @@ zlib-version = 1.2.11
 # suffix from the list below.
 astrometrynet-version = 0.77
 atlas-version = 3.10.3
+bison-version = 3.4.2
 cairo-version = 1.16.0
 cdsclient-version = 3.84
 cfitsio-version = 3.47
 cmake-version = 3.15.3
 fftw-version = 3.3.8
+flex-version = 2.6.4
 flock-version = 0.2.3
 freetype-version = 2.9
 ghostscript-version = 9.27
 gnuastro-version = 0.10
 gsl-version = 2.6
 hdf5-version = 1.10.5
+help2man-version = 1.47.11
 imagemagick-version = 7.0.8-67
 imfit-version = 1.6.1
 libffi-version = 3.2.1
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk
index 3516330..9f7b7e1 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -133,16 +133,19 @@ include reproduce/software/make/python.mk
 # downloaded file has our desired format.
 tarballs = $(foreach t, astrometry.net-$(astrometrynet-version).tar.gz \
                         atlas-$(atlas-version).tar.bz2 \
+                        bison-$(bison-version).tar.xz \
                         cairo-$(cairo-version).tar.xz \
                         cdsclient-$(cdsclient-version).tar.gz \
                         cfitsio-$(cfitsio-version).tar.gz \
                         cmake-$(cmake-version).tar.gz \
-                        freetype-$(freetype-version).tar.gz \
                         fftw-$(fftw-version).tar.gz \
+                        flex-$(flex-version).tar.gz \
+                        freetype-$(freetype-version).tar.gz \
                         ghostscript-$(ghostscript-version).tar.gz \
                         gnuastro-$(gnuastro-version).tar.lz \
                         gsl-$(gsl-version).tar.gz \
                         hdf5-$(hdf5-version).tar.gz \
+                        help2man-$(help2man-version).tar.xz \
                         imagemagick-$(imagemagick-version).tar.xz \
                         imfit-$(imfit-version).tar.gz \
                         install-tl-unx.tar.gz \
@@ -183,6 +186,7 @@ $(tarballs): $(tdir)/%: | $(lockdir)
 	  mergenames=0
 	  c=$(atlas-checksum)
 	  w=https://sourceforge.net/projects/math-atlas/files/Stable/$(atlas-version)/atlas$(atlas-version).tar.bz2/download
+	elif [ $$n = bison       ]; then c=$(bison-checksum); w=http://ftp.gnu.org/gnu/bison/
 	elif [ $$n = cairo       ]; then c=$(cairo-checksum); w=https://www.cairographics.org/releases
 	elif [ $$n = cdsclient   ]; then c=$(cdsclient-checksum); w=http://cdsarc.u-strasbg.fr/ftp/pub/sw
 	elif [ $$n = cfitsio     ]; then c=$(cfitsio-checksum); w=https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c
@@ -194,6 +198,7 @@ $(tarballs): $(tdir)/%: | $(lockdir)
 	               | awk '{printf("%d.%d", $$1, $$2)}')
 	  w=https://cmake.org/files/v$$majv/cmake-$(cmake-version).tar.gz
 	elif [ $$n = fftw        ]; then c=$(fftw-checksum); w=ftp://ftp.fftw.org/pub/fftw
+	elif [ $$n = flex        ]; then c=$(flex-checksum); w=https://github.com/westes/flex/files/981163
 	elif [ $$n = freetype    ]; then c=$(freetype-checksum); w=https://download.savannah.gnu.org/releases/freetype
 	elif [ $$n = ghostscript ]; then
 	  c=$(ghostscript-checksum)
@@ -206,6 +211,7 @@ $(tarballs): $(tdir)/%: | $(lockdir)
 	  c=$(hdf5-checksum)
 	  majorver=$$(echo $(hdf5-version) | sed -e 's/\./ /g' | awk '{printf("%d.%d", $$1, $$2)}')
 	  w=https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-$$majorver/hdf5-$(hdf5-version)/src/$*
+	elif [ $$n = help        ]; then c=$(help2man-checksum); w=http://ftp.gnu.org/gnu/help2man
 	elif [ $$n = imagemagick ]; then c=$(imagemagick-checksum); w=http://akhlaghi.org/reproduce-software
 	elif [ $$n = imfit       ]; then
 	  mergenames=0
@@ -640,8 +646,10 @@ $(ibidir)/astrometrynet: $(tdir)/astrometry.net-$(astrometrynet-version).tar.gz
 	&& cp $(dtexdir)/astrometrynet.tex $(ictdir)/ \
 	&& echo "Astrometry.net $(astrometrynet-version) \citep{astrometrynet}" > $@
 
-
-
+$(ibidir)/bison: $(tdir)/bison-$(bison-version).tar.xz \
+                 $(ibidir)/help2man
+	$(call gbuild, $<, bison-$(bison-version), static, ,V=1) \
+	&& echo "GNU Bison $(bison-version)" > $@
 
 # cdsclient is a set of software written in c to interact with astronomical
 # database servers. It is a dependency of `scamp' to be able to download
@@ -688,6 +696,11 @@ $(ibidir)/cmake: $(tdir)/cmake-$(cmake-version).tar.gz \
 	&& rm -rf cmake-$(cmake-version) \
 	&& echo "CMake $(cmake-version)" > $@
 
+$(ibidir)/flex: $(tdir)/flex-$(flex-version).tar.gz \
+                $(ibidir)/bison
+	$(call gbuild, $<, flex-$(flex-version), static, ,V=1) \
+	&& echo "Flex $(swig-version)" > $@
+
 $(ibidir)/ghostscript: $(tdir)/ghostscript-$(ghostscript-version).tar.gz \
                        $(ibidir)/libtiff
 	$(call gbuild, $<, ghostscript-$(ghostscript-version)) \
@@ -708,6 +721,10 @@ endif
 	&& cp $(dtexdir)/gnuastro.tex $(ictdir)/ \
 	&& echo "GNU Astronomy Utilities $(gnuastro-version) \citep{gnuastro}" > $@
 
+$(ibidir)/help2man: $(tdir)/help2man-$(help2man-version).tar.xz
+	$(call gbuild, $<, help2man-$(help2man-version), static, ,V=1) \
+	&& echo "Help2man $(Help2man-version)" > $@
+
 $(ibidir)/imagemagick: $(tdir)/imagemagick-$(imagemagick-version).tar.xz \
                        $(ibidir)/libjpeg \
                        $(ibidir)/libtiff \