cfitsio, bump version, keep older around (#10285)

Older one still in use

sci-libs/cfitsio/cfitsio-4.4.0.recipe

@@ -7,7 +7,8 @@ COPYRIGHT="1996-2019 William D. Pence - HEASARC, NASA/GSFC"
 LICENSE="CFITSIO"
 REVISION="1"
 SOURCE_URI="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-$portVersion.tar.gz"
-CHECKSUM_SHA256="5b65a20d5c53494ec8f638267fca4a629836b7ac8dd0ef0266834eab270ed4b3"
+CHECKSUM_SHA256="95900cf95ae760839e7cb9678a7b2fad0858d6ac12234f934bd1cb6bfc246ba9"
+SOURCE_DIR="cfitsio-$portVersion"
 PATCHES="cfitsio-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2 ?arm ?ppc ?sparc"
@@ -21,7 +22,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 fi
 
 portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
-libVersion="9.3.49"
+libVersion="10.4.4.0"
 libVersionCompat="$libVersion compat >= ${libVersion%.*.*}"
 
 PROVIDES="
@@ -54,6 +55,9 @@ REQUIRES_devel="
 	lib:libssl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+CONFLICTS_devel="
+	cfitsio3${secondaryArchSuffix}_devel
+	"
 
 PROVIDES_utils="
 	cfitsio${secondaryArchSuffix}_utils = $portVersionCompat
@@ -64,6 +68,10 @@ REQUIRES_utils="
 	cfitsio$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+CONFLICTS_utils="
+	cfitsio3${secondaryArchSuffix}_utils
 	"
 
 BUILD_REQUIRES="

sci-libs/cfitsio/cfitsio3-3.49.recipe

@@ -0,0 +1,139 @@
+SUMMARY="A FITS File Subroutine Library"
+DESCRIPTION="CFITSIO is a library of ANSI C routines for reading and writing \
+FITS format data files. A set of Fortran-callable wrapper routines are also \
+included for the convenience of Fortran programmers."
+HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
+COPYRIGHT="1996-2019 William D. Pence - HEASARC, NASA/GSFC"
+LICENSE="CFITSIO"
+REVISION="1"
+SOURCE_URI="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-$portVersion.tar.gz"
+CHECKSUM_SHA256="5b65a20d5c53494ec8f638267fca4a629836b7ac8dd0ef0266834eab270ed4b3"
+SOURCE_DIR="cfitsio-$portVersion"
+PATCHES="cfitsio-$portVersion.patchset"
+
+ARCHITECTURES="all !x86_gcc2 ?arm ?ppc ?sparc"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
+libVersion="9.3.49"
+libVersionCompat="$libVersion compat >= ${libVersion%.*.*}"
+
+PROVIDES="
+	cfitsio3$secondaryArchSuffix = $portVersionCompat
+	lib:libcfitsio$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
+	lib:libgfortran$secondaryArchSuffix
+	lib:libnghttp2$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	cfitsio3${secondaryArchSuffix}_devel = $portVersionCompat
+	devel:libcfitsio$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	cfitsio3$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
+	lib:libgfortran$secondaryArchSuffix
+	lib:libnghttp2$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_utils="
+	cfitsio3${secondaryArchSuffix}_utils = $portVersionCompat
+	cmd:fpack$commandSuffix = $portVersionCompat
+	cmd:funpack$commandSuffix = $portVersionCompat
+	"
+REQUIRES_utils="
+	cfitsio3$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libbz2$secondaryArchSuffix
+	devel:libcurl$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoreconf
+	cmd:awk
+	cmd:cmp
+	cmd:gcc$secondaryArchSuffix
+	cmd:gfortran$secondaryArchSuffix
+	cmd:make
+	"
+
+TEST_REQUIRES="
+	cmd:diff
+	"
+
+defineDebugInfoPackage cfitsio3$secondaryArchSuffix \
+	"$libDir"/libcfitsio.so.$libVersion
+
+BUILD()
+{
+	WITHSSE=""
+	if [ $effectiveTargetArchitecture == x86_64 ]; then
+		GCC5FLAGS="--enable-x86-64"
+		WITHSSE="--enable-ssse3"
+	fi
+
+	sed -e 's|LDFLAGS=.*|LDFLAGS="$LDFLAGS"|g' -i configure.in
+
+	autoreconf -vfi
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir="$commandBinDir" \
+		--enable-reentrant \
+		--with-bzip2 $WITHSSE
+
+	make $jobArgs
+	make utils $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm -f $libDir/libcfitsio.a
+
+	prepareInstalledDevelLib libcfitsio
+	fixPkgconfig
+
+	# copy pdf documentation
+	mkdir -p $developDocDir
+	cp -rd docs/*.pdf $developDocDir/
+
+	# devel package
+	packageEntries devel $developDir
+
+	# util package
+	packageEntries utils $commandBinDir
+}
+
+TEST()
+{
+	export LIBRARY_PATH=".:$LIBRARY_PATH"
+	make testprog
+	testprog > testprog.lis
+	diff testprog.lis testprog.out
+	cmp testprog.fit testprog.std
+}

sci-libs/cfitsio/patches/cfitsio-4.4.0.patchset

@@ -0,0 +1,31 @@
+From 8ab4278e1f7719bf535004a3c6607619f2d04e1c Mon Sep 17 00:00:00 2001
+From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com>
+Date: Mon, 25 May 2020 23:11:01 +0000
+Subject: Build fix
+
+
+diff --git a/Makefile.in b/Makefile.in
+index d1dfb23..15a64f0 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -121,7 +121,7 @@ install:	lib${PACKAGE}.a ${INSTALL_DIRS}
+ 		done
+ 		/bin/cp fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}
+ 		/bin/cp cfitsio.pc ${CFITSIO_LIB}/pkgconfig
+-		@for task in ${FPACK_UTILS} ${UTILS}; do \
++		@for task in ${FPACK_UTILS}; do \
+ 		    if [ -f $$task ]; then \
+ 			if [ ! -d ${CFITSIO_BIN} ]; then mkdir -p ${CFITSIO_BIN}; fi; \
+ 			echo "/bin/cp $$task ${CFITSIO_BIN}"; \
+@@ -142,7 +142,7 @@ FPACK_UTILS	= fpack funpack
+ UTILS		= cookbook fitscopy imcopy smem speed testprog fitsverify
+ 
+ # Optional build target:
+-utils:		${FPACK_UTILS} ${UTILS}
++utils:		${FPACK_UTILS}
+ 
+ FVERIFY_SRC	= utilities/ftverify.c utilities/fvrf_data.c \
+ 		  utilities/fvrf_file.c utilities/fvrf_head.c \
+-- 
+2.43.2
+