6 files changed, 53 insertions, 33 deletions
diff --git a/academic/ds9/README b/academic/ds9/README
index 5bffb53e7f..3569e0678c 100644
--- a/academic/ds9/README
+++ b/academic/ds9/README
@@ -1,7 +1,13 @@
-SAOImage DS9 is an application for astronomical imaging and data
-visualization. It supports the FITS format and binary tables. As well
-as standard imaging manipulation tools, it includes many advanced
-features such as multiple frame buffers, 2D, 3D, RGB frame buffers,
-region and colormap manipulation, mosaic images and geometric markers.
-DS9 supports a variety of coordinate systems and it has a user
-configurable interface.
+SAOImageDS9 is an astronomical imaging and data visualization
+application. DS9 supports FITS images and binary tables,  multiple
+frame buffers, region manipulation, and many scale algorithms and
+colormaps. All versions and platforms support a consistent set of GUI
+and functional capabilities.  DS9 supports advanced features such as
+2-D, 3-D and RGB frame buffers, mosaic images, tiling, blinking,
+geometric markers, colormap manipulation, scaling, arbitrary zoom,
+cropping, rotation, pan, and a variety of coordinate systems.
+Furthermore, the application is stand-alone and requires no
+installation or support files.  The GUI for DS9 is user configurable.
+GUI elements such as the coordinate display, panner, magnifier,
+horizontal and vertical graphs, button bar, and color bar can be
+configured via menus or the command line.
diff --git a/academic/ds9/ds9-icon.png b/academic/ds9/ds9-icon.png
deleted file mode 100644
index 09254821f3..0000000000
--- a/academic/ds9/ds9-icon.png
+++ /dev/null
diff --git a/academic/ds9/ds9.SlackBuild b/academic/ds9/ds9.SlackBuild
index a757a1bed5..096402f85e 100644
--- a/academic/ds9/ds9.SlackBuild
+++ b/academic/ds9/ds9.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
-# Slackware build script for SAOImage DS9
+# Slackware build script for ds9 (SAOImageDS9)
 
-# Copyright 2017 Nitish Ragoomundun, Mauritius
+# Copyright 2022 Nitish Ragoomundun, Mauritius
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ds9
-VERSION=${VERSION:-7.6}
+VERSION=${VERSION:-8.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,15 +82,18 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./unix/configure \
+unix/configure \
   --prefix=/usr \
   --bindir=/usr/bin \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-arch=${ARCH}-slackware-linux
+  --x-includes=/usr/include \
+  --x-libraries=/usr/lib$LIBDIRSUFFIX \
+  --with-x \
+  --with-arch=$ARCH-slackware-linux
 
-make -j1
+make
 
 # Install the ds9 executable
 mkdir -p $PKG/usr/{bin,doc/$PRGNAM-$VERSION}
@@ -89,8 +102,8 @@ install -D -m755 bin/ds9 $PKG/usr/bin/
 # Install icon
 mkdir -p $PKG/usr/share/applications
 mkdir -p $PKG/usr/share/pixmaps
+install -m 644 ds9/doc/sun.png $PKG/usr/share/pixmaps/ds9-icon.png
 install -m 644 $CWD/ds9.desktop $PKG/usr/share/applications
-install -m 644 $CWD/ds9-icon.png $PKG/usr/share/pixmaps
 
 # Copy documentation
 cp -a BUILD.txt LICENSE README.md ds9/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
@@ -102,4 +115,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/academic/ds9/ds9.desktop b/academic/ds9/ds9.desktop
index 318d5d41c2..d942e73988 100644
--- a/academic/ds9/ds9.desktop
+++ b/academic/ds9/ds9.desktop
@@ -1,9 +1,10 @@
 [Desktop Entry]
-Name=DS9
-GenericName=SAOImage DS9
-Comment=SAOImage DS9 Astronomical Software
 Exec=ds9
 Icon=ds9-icon
-Terminal=false
 Type=Application
 Categories=Education;Science;Astronomy;
+Name=ds9
+GenericName=SAOImageDS9
+Comment=Astronomical Software and FITS viewing program
+MimeType=image/fits;
+Terminal=false
diff --git a/academic/ds9/ds9.info b/academic/ds9/ds9.info
index bab590e743..59d26462bc 100644
--- a/academic/ds9/ds9.info
+++ b/academic/ds9/ds9.info
@@ -1,8 +1,8 @@
 PRGNAM="ds9"
-VERSION="7.6"
-HOMEPAGE="http://ds9.si.edu/site/Home.html"
-DOWNLOAD="http://ds9.si.edu/archive/source/ds9.7.6.tar.gz"
-MD5SUM="b700dd815fe1f7fa93e3e3bba1132ca7"
+VERSION="8.4.1"
+HOMEPAGE="https://sites.google.com/cfa.harvard.edu/saoimageds9/home"
+DOWNLOAD="https://ds9.si.edu/archive/source/ds9.8.4.1.tar.gz"
+MD5SUM="b227d7ce367d3d7901d88cd5fccd23f7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/ds9/slack-desc b/academic/ds9/slack-desc
index b07917b061..713bb9386a 100644
--- a/academic/ds9/slack-desc
+++ b/academic/ds9/slack-desc
@@ -8,12 +8,12 @@
    |-----handy-ruler------------------------------------------------------|
 ds9: ds9 (Astronomical tool)
 ds9:
-ds9: DS9 is an astronomical imaging and visualization tool. It supports
-ds9: the FITS format and binary tables. It includes many imaging features
-ds9: such as tiling, cropping, as well as advanced features such as
-ds9: multiple 2D, 3D, RGB frame buffers, colormap manipulation and mosaic
-ds9: images. DS9 also supports a variety of coordinate systems and has a
-ds9: user configurable interface.
-ds9:
-ds9: Homepage: http://ds9.si.edu/site/Home.html
+ds9: SAOImageDS9 is an astronomical imaging and data visualization tool.
+ds9: It supports FITS images and binary tables. It also includes many
+ds9: advanced imaging features such as 2-D, 3-D and RGB frame buffers,
+ds9: mosaic images, tiling, blinking, geometric markers, colormap
+ds9: manipulation, scaling, arbitrary zoom, cropping, rotation, pan, and a
+ds9: variety of coordinate systems. DS9 also has user configurable GUI
+ds9: elements.
+ds9: Homepage: https://sites.google.com/cfa.harvard.edu/saoimageds9/home
 ds9: