Add cfitsio lib to build fpack and funpack

This reverts commit c064ccf.

Makefile

@@ -28,8 +28,8 @@ export RMFILES=$(iraf)unix/bin/rmfiles.e
 
 export CFLAGS = -mmacosx-version-min=$(MINVERSION) -arch $(MACARCH) -O2
 export LDFLAGS = -mmacosx-version-min=$(MINVERSION) -arch $(MACARCH) -O2
-export XC_CFLAGS = $(CFLAGS) -I$(iraf)include
-export XC_LFLAGS = $(LDFLAGS)
+export XC_CFLAGS = $(CFLAGS) -I$(BUILDDIR)/cfitsio
+export XC_LFLAGS = $(LDFLAGS) -L$(BUILDDIR)/cfitsio
 
 PATH += :$(BINDIR)
 
@@ -132,7 +132,15 @@ ctio.pkg: core.pkg
 		 --version 0+2023-11-12 \
 	         $@
 
-fitsutil.pkg: core.pkg
+# libcfitsio.a is required for fitsutil
+$(BUILDDIR)/cfitsio/libcfitsio.a:
+	mkdir -p $(BUILDDIR)/cfitsio
+	curl -L https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.4.0.tar.gz | \
+	  tar xzf - -C $(BUILDDIR)/cfitsio --strip-components=1
+	cd $(BUILDDIR)/cfitsio && ./configure --disable-curl
+	$(MAKE) -C $(BUILDDIR)/cfitsio libcfitsio.a
+
+fitsutil.pkg: core.pkg $(BUILDDIR)/cfitsio/libcfitsio.a
 	mkdir -p $(BUILDDIR)/fitsutil
 	curl -L https://github.com/iraf-community/iraf-fitsutil/archive/0858bbb.tar.gz | \
 	  tar xzf - -C $(BUILDDIR)/fitsutil --strip-components=1