Merge pull request #18 from iraf-community/update-to-2.18

Update to 2.18
iraf-community · Apr 5, 2024 · ed0bdf3 · ed0bdf3
2 parents 9398034 + d177a6d
commit ed0bdf3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 97 deletions.
diff --git a/Makefile b/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)
 
@@ -41,11 +41,8 @@ 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.17.1.tar.gz | \
+	curl -L https://github.com/iraf-community/iraf/archive/refs/tags/v2.18.tar.gz | \
 	  tar xzf - -C $(BUILDDIR)/iraf --strip-components=1
-	patch -d $(BUILDDIR)/iraf -p1 < core/patches/0001-fix-DESTDIR-in-Makefile.patch
-	patch -d $(BUILDDIR)/iraf -p1 < core/patches/0002-Create-bindir-and-includedir-on-libvotable-install.patch
-	patch -d $(BUILDDIR)/iraf -p1 < core/patches/0003-Allow-empty-IRAFARCH-in-irafpath.patch
 	$(MAKE) -C $(BUILDDIR)/iraf
 	mkdir -p $(INSTDIR)/iraf
 	$(MAKE) -C $(BUILDDIR)/iraf DESTDIR=$(INSTDIR)/iraf install 
@@ -57,7 +54,7 @@ core.pkg:
 	         --root $(INSTDIR)/iraf \
 		 --install-location / \
 		 $(PKGBUILD_ARG) \
-		 --version 2.17.1 \
+		 --version 2.18 \
 	         $@
 
 ximtool.pkg: core.pkg
@@ -135,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

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ macOS](https://iraf-community.github.io/install.html#macos) web page.
 
 ### Software versions
 
-* IRAF [2.17.1](https://github.com/iraf-community/iraf/releases/tag/v2.17.1),
+* 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),
 * 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

diff --git a/core/patches/0001-fix-DESTDIR-in-Makefile.patch b/core/patches/0001-fix-DESTDIR-in-Makefile.patch
diff --git a/core/patches/0002-Create-bindir-and-includedir-on-libvotable-install.patch b/core/patches/0002-Create-bindir-and-includedir-on-libvotable-install.patch
diff --git a/core/patches/0003-Allow-empty-IRAFARCH-in-irafpath.patch b/core/patches/0003-Allow-empty-IRAFARCH-in-irafpath.patch
diff --git a/resources/conclusion.html b/resources/conclusion.html
@@ -16,22 +16,14 @@
   <body>
     <p style="text-align:center; font-size:42pt;margin-bottom: 0px;margin-top: 24px;">&#9989;</p>
     <h2 style="text-align:center">The installation was successful.</h1>
-    <p style="text-aligh:center">
-      You can now use the usual IRAF commands like <b>xgterm</b> and <b>ecl</b>.
-    </p>
-    <!--
-    <p style="text-align:center">
-      You can now start a graphical terminal and IRAF with the
-      command
-    </p>
     <p style="text-align:center">
+      You can now start a graphical terminal and IRAF with the command
+      <br />
       <code>irafcl -x</code>
     </p>
-    -->
     <p style="text-align:center">
       For more information, check the IRAF homepage
-    </p>
-    <p style="text-align:center">
+      <br />
       <a href="https://iraf-community.github.io">https://iraf-community.github.io</a>
     </p>