diff --git a/sci-libs/cfitsio/cfitsio-3.48.recipe b/sci-libs/cfitsio/cfitsio-3.49.recipe
similarity index 96%
rename from sci-libs/cfitsio/cfitsio-3.48.recipe
rename to sci-libs/cfitsio/cfitsio-3.49.recipe
index 3b87a79dd..c1cbda48b 100644
--- a/sci-libs/cfitsio/cfitsio-3.48.recipe
+++ b/sci-libs/cfitsio/cfitsio-3.49.recipe
@@ -7,7 +7,7 @@ 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="91b48ffef544eb8ea3908543052331072c99bf09ceb139cb3c6977fc3e47aac1"
+CHECKSUM_SHA256="5b65a20d5c53494ec8f638267fca4a629836b7ac8dd0ef0266834eab270ed4b3"
 PATCHES="cfitsio-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86_64 ?arm ?ppc ?sparc"
@@ -21,7 +21,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 fi
 
 portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
-libVersion="9.3.48"
+libVersion="9.3.49"
 libVersionCompat="$libVersion compat >= ${libVersion%.*.*}"
 
 PROVIDES="
diff --git a/sci-libs/cfitsio/patches/cfitsio-3.47.patchset b/sci-libs/cfitsio/patches/cfitsio-3.47.patchset
deleted file mode 100644
index bd3f14003..000000000
--- a/sci-libs/cfitsio/patches/cfitsio-3.47.patchset
+++ /dev/null
@@ -1,106 +0,0 @@
-From 9ec0e9d76c475bb5d951c57fccb2579064146296 Mon Sep 17 00:00:00 2001
-From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com>
-Date: Mon, 6 Apr 2020 16:18:48 +0000
-Subject: Added Haiku support to autotools
-
-
-diff --git a/configure.in b/configure.in
-index 69cabc1..4887824 100644
---- a/configure.in
-+++ b/configure.in
-@@ -146,6 +146,11 @@ case $host in
- 	ARCH="hp"
- 	EXT="hpu"
- 	;;
-+    *haiku*)
-+  # Haiku can be arm, i386 or x86_64
-+  ARCH=`uname -p`
-+  EXT="haiku"
-+  ;;
-     *irix*)
- 	ARCH="sgi"
- 	EXT="sgi"
-@@ -315,6 +320,11 @@ case $host in
-         AC_DEFINE(_LARGEFILE_SOURCE)
-         AC_DEFINE(_FILE_OFFSET_BITS,64)
- 	;;
-+    *haiku*)
-+        # For large file support:
-+        AC_DEFINE(_LARGEFILE_SOURCE)
-+        AC_DEFINE(_FILE_OFFSET_BITS,64)
-+  ;;
-     *mingw32*)
-         AC_MSG_CHECKING([for large file support])
-         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>],
-@@ -421,6 +431,11 @@ case $EXT in
-     CFITSIO_SHLIB="lib\${PACKAGE}\${SHLIB_SUFFIX}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
-     CFITSIO_SHLIB_SONAME="lib\${PACKAGE}\${SHLIB_SUFFIX}.\${CFITSIO_SONAME}"
-     ;;
-+  haiku)
-+    SHLIB_LD=":"
-+    CFITSIO_SHLIB="lib\${PACKAGE}\${SHLIB_SUFFIX}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
-+    CFITSIO_SHLIB_SONAME="lib\${PACKAGE}\${SHLIB_SUFFIX}.\${CFITSIO_SONAME}"
-+    ;;
-   osf)
-     SHLIB_LD="ld -shared -expect_unresolved '*'"
-     LD_FLAGS="-taso"
--- 
-2.26.0
-
-
-From 51552ef99510116d7760a60a6997013c0356af3d Mon Sep 17 00:00:00 2001
-From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com>
-Date: Fri, 10 Apr 2020 16:49:23 +0000
-Subject: Removed nonworking and undocumented utils
-
-
-diff --git a/Makefile.in b/Makefile.in
-index 2ee3f74..65282d5 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -119,7 +119,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}"; \
-@@ -134,7 +134,7 @@ UTILS		= cookbook fitscopy imcopy smem speed testprog
- 
- FPACK_UTILS	= fpack funpack
- 
--utils:		${FPACK_UTILS} ${UTILS}
-+utils:		${FPACK_UTILS}
- 
- swapproc.o:	swapproc.c
- 		${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
--- 
-2.26.0
-
-
-From d2fdc7fefb349b12497e55a6b17144e1535ba97f Mon Sep 17 00:00:00 2001
-From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com>
-Date: Sun, 19 Apr 2020 17:11:04 +0000
-Subject: Added network in search-libs
-
-
-diff --git a/configure.in b/configure.in
-index 4887824..dcc61f1 100644
---- a/configure.in
-+++ b/configure.in
-@@ -643,8 +643,8 @@ AC_CHECK_FUNC(fmemopen, AC_DEFINE(HAVE_FMEMOPEN), [AC_MSG_WARN(Disabling support
- # ==================== END OF SHARED MEMORY DRIVER SECTION ================
- # ================= test for the unix networking functions ================
- 
--AC_SEARCH_LIBS([gethostbyname], [nsl], cfitsio_have_nsl=1, cfitsio_have_nsl=0)
--AC_SEARCH_LIBS([connect], [socket], cfitsio_have_socket=1,
-+AC_SEARCH_LIBS([gethostbyname], [nsl network], cfitsio_have_nsl=1, cfitsio_have_nsl=0)
-+AC_SEARCH_LIBS([connect], [socket network], cfitsio_have_socket=1,
-                cfitsio_have_socket=0, [-lnsl])
- 
- if test "$cfitsio_have_nsl" = 1 -a "$cfitsio_have_socket" = 1; then
--- 
-2.26.0
-
diff --git a/sci-libs/cfitsio/patches/cfitsio-3.48.patchset b/sci-libs/cfitsio/patches/cfitsio-3.49.patchset
similarity index 66%
rename from sci-libs/cfitsio/patches/cfitsio-3.48.patchset
rename to sci-libs/cfitsio/patches/cfitsio-3.49.patchset
index e97dfd9b7..767bc56ff 100644
--- a/sci-libs/cfitsio/patches/cfitsio-3.48.patchset
+++ b/sci-libs/cfitsio/patches/cfitsio-3.49.patchset
@@ -1,11 +1,11 @@
-From 08ec4c96a44d501b7c1e0cfe01f7a54b9355aedb Mon Sep 17 00:00:00 2001
+From 80906990e8cb66f024336e71af75896458bd2bc4 Mon Sep 17 00:00:00 2001
 From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com>
 Date: Mon, 25 May 2020 23:11:01 +0000
 Subject: Added Haiku support to autotools
 
 
 diff --git a/Makefile.in b/Makefile.in
-index a0fbe2f..d546675 100644
+index c641a4d..10e7832 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -119,7 +119,7 @@ install:	lib${PACKAGE}.a ${INSTALL_DIRS}
@@ -17,20 +17,20 @@ index a0fbe2f..d546675 100644
  		    if [ -f $$task ]; then \
  			if [ ! -d ${CFITSIO_BIN} ]; then mkdir -p ${CFITSIO_BIN}; fi; \
  			echo "/bin/cp $$task ${CFITSIO_BIN}"; \
-@@ -134,7 +134,7 @@ UTILS		= cookbook fitscopy imcopy smem speed testprog
- 
+@@ -135,7 +135,7 @@ UTILS		= cookbook fitscopy imcopy smem speed testprog
  FPACK_UTILS	= fpack funpack
  
+ # Optional build target:
 -utils:		${FPACK_UTILS} ${UTILS}
 +utils:		${FPACK_UTILS}
  
  swapproc.o:	swapproc.c
  		${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
 diff --git a/configure.in b/configure.in
-index 39414bd..866bf14 100644
+index 7d2e003..0df5765 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -146,6 +146,11 @@ case $host in
+@@ -151,6 +151,11 @@ case $host in
  	ARCH="hp"
  	EXT="hpu"
  	;;
@@ -42,7 +42,7 @@ index 39414bd..866bf14 100644
      *irix*)
  	ARCH="sgi"
  	EXT="sgi"
-@@ -319,6 +324,11 @@ case $host in
+@@ -329,6 +334,11 @@ case $host in
          # LDFLAGS used by utilities:
          LDFLAGS_BIN="$LDFLAGS_BIN -Wl,-rpath,\${CFITSIO_LIB}"
  	;;
@@ -54,7 +54,7 @@ index 39414bd..866bf14 100644
      *mingw32*)
          AC_MSG_CHECKING([for large file support])
          AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>],
-@@ -425,6 +435,11 @@ case $EXT in
+@@ -440,6 +450,11 @@ case $EXT in
      CFITSIO_SHLIB="lib\${PACKAGE}\${SHLIB_SUFFIX}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
      CFITSIO_SHLIB_SONAME="lib\${PACKAGE}\${SHLIB_SUFFIX}.\${CFITSIO_SONAME}"
      ;;
@@ -66,17 +66,6 @@ index 39414bd..866bf14 100644
    osf)
      SHLIB_LD="ld -shared -expect_unresolved '*'"
      LD_FLAGS="-taso"
-@@ -632,8 +647,8 @@ AC_CHECK_FUNC(fmemopen, AC_DEFINE(HAVE_FMEMOPEN), [AC_MSG_WARN(Disabling support
- # ==================== END OF SHARED MEMORY DRIVER SECTION ================
- # ================= test for the unix networking functions ================
- 
--AC_SEARCH_LIBS([gethostbyname], [nsl], cfitsio_have_nsl=1, cfitsio_have_nsl=0)
--AC_SEARCH_LIBS([connect], [socket], cfitsio_have_socket=1,
-+AC_SEARCH_LIBS([gethostbyname], [nsl network], cfitsio_have_nsl=1, cfitsio_have_nsl=0)
-+AC_SEARCH_LIBS([connect], [socket network], cfitsio_have_socket=1,
-                cfitsio_have_socket=0, [-lnsl])
- 
- if test "$cfitsio_have_nsl" = 1 -a "$cfitsio_have_socket" = 1; then
 -- 
-2.26.0
+2.30.0