Update IRAF packages

.github/workflows/build.yml

@@ -14,8 +14,8 @@ jobs:
           - name: macOS 12 (Intel)
             os: macos-12
 
-          - name: macOS 14 (M1)
-            os: macos-14
+          - name: macOS 15 (M1)
+            os: macos-15
 
     env:
       TERM: ansi
@@ -33,6 +33,10 @@ jobs:
           sudo installer -package /Volumes/XQuartz-2.8.1/XQuartz.pkg -target /
           sudo rm -f /usr/local/include/tcl.h
 
+      - name: Setup required build tools from brew (ImageMagic for the moment)
+        run: |
+          brew install imagemagick
+
       - name: Build package
         run: |
            make -j 4

Makefile

@@ -29,7 +29,7 @@ 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$(BUILDDIR)/cfitsio
-export XC_LFLAGS = $(LDFLAGS) -L$(BUILDDIR)/cfitsio
+export XC_LFLAGS = $(LDFLAGS) -L$(BUILDDIR)/cfitsio/.libs
 
 PATH += :$(BINDIR)
 
@@ -41,7 +41,7 @@ PKGS = core.pkg ximtool.pkg xgterm.pkg ctio.pkg fitsutil.pkg mscred.pkg	\
 
 core.pkg:
 	mkdir -p $(BUILDDIR)/iraf
-	curl -L https://github.com/iraf-community/iraf/archive/refs/tags/v2.18.tar.gz | \
+	curl -L https://github.com/iraf-community/iraf/archive/refs/tags/v2.18.1rc1.tar.gz | \
 	  tar xzf - -C $(BUILDDIR)/iraf --strip-components=1
 	$(MAKE) -C $(BUILDDIR)/iraf
 	mkdir -p $(INSTDIR)/iraf
@@ -54,12 +54,12 @@ core.pkg:
 	         --root $(INSTDIR)/iraf \
 		 --install-location / \
 		 $(PKGBUILD_ARG) \
-		 --version 2.18 \
+		 --version 2.18.1rc1 \
 	         $@
 
 ximtool.pkg: core.pkg
 	mkdir -p $(BUILDDIR)/x11iraf
-	curl -L https://github.com/iraf-community/x11iraf/archive/refs/tags/v2.1.tar.gz | \
+	curl -L https://github.com/iraf-community/x11iraf/archive/refs/tags/v2.2rc1.tar.gz | \
 	  tar xzf - -C $(BUILDDIR)/x11iraf --strip-components=1
 	patch -d $(BUILDDIR)/x11iraf -p1 < \
 	      xgterm/patches/0001-Force-setting-of-local-terminfo-database.patch
@@ -74,9 +74,18 @@ ximtool.pkg: core.pkg
 	install -m755 $(BUILDDIR)/x11iraf/ximtool/clients/ism_wcspix.e \
 	        $(INSTDIR)/ximtool/XImtool.app/Contents/Resources/bin
 	install ximtool/Info.plist $(INSTDIR)/ximtool/XImtool.app/Contents/Info.plist
+	mkdir $(BUILDDIR)/x11iraf/ximtool/XImtool.iconset
+	for sz in 16 32 64 128 256 512 1024; do \
+	    magick $(BUILDDIR)/x11iraf/ximtool/XImtool.xcf -background transparent -flatten \
+	      -bordercolor transparent -border 5% -scale $${sz}x$${sz} \
+	      $(BUILDDIR)/x11iraf/ximtool/XImtool.iconset/icon_$${sz}x$${sz}.png ; \
+	    sz2=$$(expr $${sz} / 2) \
+	    cp $(BUILDDIR)/x11iraf/ximtool/XImtool.iconset/icon_$${sz}x$${sz}.png \
+	       $(BUILDDIR)/x11iraf/ximtool/XImtool.iconset/icon_$${sz2}x$${sz2}@2x.png ; \
+	done
 	iconutil --convert icns \
 	         --output $(INSTDIR)/ximtool/XImtool.app/Contents/Resources/XImtool.icns \
-	         ximtool/XImtool.iconset/
+	         $(BUILDDIR)/x11iraf/ximtool/XImtool.iconset/
 	install $(BUILDDIR)/x11iraf/ximtool/ximtool.man \
 	        $(INSTDIR)/ximtool/XImtool.app/Contents/Resources/man/ximtool.1
 	codesign -s - -i community.iraf.ximtool $(INSTDIR)/ximtool/XImtool.app
@@ -85,7 +94,7 @@ ximtool.pkg: core.pkg
 	         --install-location /Applications \
 	         --scripts ximtool/scripts \
 		 $(PKGBUILD_ARG) \
-		 --version 2.1 \
+		 --version 2.2rc1 \
 	         ximtool.pkg
 
 xgterm.pkg: ximtool.pkg # This re-uses the same build as ximtool
@@ -97,9 +106,18 @@ xgterm.pkg: ximtool.pkg # This re-uses the same build as ximtool
 	        $(INSTDIR)/xgterm/XGTerm.app/Contents/Resources/bin
 	install -m755 xgterm/XGTerm $(INSTDIR)/xgterm/XGTerm.app/Contents/MacOS
 	install xgterm/Info.plist $(INSTDIR)/xgterm/XGTerm.app/Contents/Info.plist
+	mkdir $(BUILDDIR)/x11iraf/xgterm/XGTerm.iconset
+	for sz in 16 32 64 128 256 512 1024; do \
+	    magick $(BUILDDIR)/x11iraf/xgterm/XGTerm.xcf -background transparent -flatten \
+	      -bordercolor transparent -border 5% -scale $${sz}x$${sz} \
+	      $(BUILDDIR)/x11iraf/xgterm/XGTerm.iconset/icon_$${sz}x$${sz}.png ; \
+	    sz2=$$(expr $${sz} / 2) ; \
+	    cp $(BUILDDIR)/x11iraf/xgterm/XGTerm.iconset/icon_$${sz}x$${sz}.png \
+	       $(BUILDDIR)/x11iraf/xgterm/XGTerm.iconset/icon_$${sz2}x$${sz2}@2x.png ; \
+	done
 	iconutil --convert icns \
 	         --output $(INSTDIR)/xgterm/XGTerm.app/Contents/Resources/XGTerm.icns \
-	         xgterm/XGTerm.iconset/
+	         $(BUILDDIR)/x11iraf/xgterm/XGTerm.iconset/
 	install $(BUILDDIR)/x11iraf/xgterm/xgterm.man \
 	        $(INSTDIR)/xgterm/XGTerm.app/Contents/Resources/man/xgterm.1
 	tic -v -o $(INSTDIR)/xgterm/XGTerm.app/Contents/Resources/terminfo \
@@ -110,7 +128,7 @@ xgterm.pkg: ximtool.pkg # This re-uses the same build as ximtool
 	         --install-location /Applications \
 	         --scripts xgterm/scripts \
 		 $(PKGBUILD_ARG) \
-		 --version 2.1 \
+		 --version 2.2rc1 \
 	         xgterm.pkg
 
 
@@ -133,16 +151,16 @@ ctio.pkg: core.pkg
 	         $@
 
 # libcfitsio.a is required for fitsutil
-$(BUILDDIR)/cfitsio/libcfitsio.a:
+$(BUILDDIR)/cfitsio/.libs/libcfitsio.a:
 	mkdir -p $(BUILDDIR)/cfitsio
-	curl -L https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.4.0.tar.gz | \
+	curl -L https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.5.0.tar.gz | \
 	  tar xzf - -C $(BUILDDIR)/cfitsio --strip-components=1
-	cd $(BUILDDIR)/cfitsio && ./configure --disable-curl
-	$(MAKE) -C $(BUILDDIR)/cfitsio libcfitsio.a
+	cd $(BUILDDIR)/cfitsio && ./configure --disable-curl --disable-shared --enable-static
+	$(MAKE) -C $(BUILDDIR)/cfitsio
 
-fitsutil.pkg: core.pkg $(BUILDDIR)/cfitsio/libcfitsio.a
+fitsutil.pkg: core.pkg $(BUILDDIR)/cfitsio/.libs/libcfitsio.a
 	mkdir -p $(BUILDDIR)/fitsutil
-	curl -L https://github.com/iraf-community/iraf-fitsutil/archive/0858bbb.tar.gz | \
+	curl -L https://github.com/iraf-community/iraf-fitsutil/archive/refs/tags/v2024.07.06.tar.gz | \
 	  tar xzf - -C $(BUILDDIR)/fitsutil --strip-components=1
 	( cd $(BUILDDIR)/fitsutil && \
 	  rm -rf bin* && \

README.md

@@ -11,10 +11,10 @@ macOS](https://iraf-community.github.io/install.html#macos) web page.
 
 ### Software versions
 
-* IRAF [2.18](https://github.com/iraf-community/iraf/releases/tag/v2.18),
-* X11IRAF [2.1](https://github.com/iraf-community/x11iraf/releases/tag/v2.1),
+* IRAF [2.18.1rc1](https://github.com/iraf-community/iraf/releases/tag/v2.18.1rc1),
+* X11IRAF [2.2rc1](https://github.com/iraf-community/x11iraf/releases/tag/v2.2rc1),
 * ctio [a6113fe](https://github.com/iraf-community/iraf-ctio/tree/a6113fe), 2023-11-12
-* fitsutil [0858bbb](https://github.com/iraf-community/iraf-fitsutil/tree/0858bbb), 2024-03-12
+* fitsutil [v2024.07.06](https://github.com/iraf-community/iraf-fitsutil/releases/tag/v2024.07.06),
 * mscred [8c160e5](https://github.com/iraf-community/iraf-mscred/tree/8c160e5), 2023-12-12
 * rvsao [2.8.5](http://tdc-www.harvard.edu/iraf/rvsao/rvsao-2.8.5.tar.gz)
 * sptable [1.0.pre20180612](https://github.com/iraf-community/iraf-sptable/releases/tag/1.0.pre20180612)
@@ -26,6 +26,7 @@ macOS](https://iraf-community.github.io/install.html#macos) web page.
 
 * install XCode tools (`xcode-select --install`)
 * install [XQuartz](https://www.xquartz.org/)
+* install ImageMagick from Brew (`brew install imagemagick`)
 * run 
    - `make` to build the host arch, 
    - `make MACARCH=x86_64` to build Intel/64bit installer on Apple Silicon