4 files changed, 38 insertions, 32 deletions
diff --git a/office/hebcal/README b/office/hebcal/README
index 393f29b70b..44b8790612 100644
--- a/office/hebcal/README
+++ b/office/hebcal/README
@@ -1,10 +1,16 @@
 hebcal - A perpetual Jewish calendar, by Danny Sadinoff
 
-Default city is New York. To change this, pass CITY to the SlackBuild
-script. Example:
+Prints Hebrew calendar info for Gregorian date range.  Holidays,
+candle lighting times, yahrzeits, weekly parshas etc.
 
-  CITY="Washington DC" ./hebcal.SlackBuild
+Default city for candle lighting times is New York. To change this,
+pass DEFAULT_CITY to the SlackBuild script. Example:
 
-See cities.h for a list of known cities and coordinates.
+  DEFAULT_CITY="Washington DC" ./hebcal.SlackBuild
 
-The city information can also be defined at run time. See README.md.
+The city information can also be specified at run time. See the man
+page.
+
+For a list of known cities and coordinates, do
+
+  hebcal info
diff --git a/office/hebcal/hebcal.SlackBuild b/office/hebcal/hebcal.SlackBuild
index b52bda74c2..04f1d63d58 100644
--- a/office/hebcal/hebcal.SlackBuild
+++ b/office/hebcal/hebcal.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hebcal
 
-# Copyright 2017 Judah Milgram, Washington DC
+# Copyright 2017-2024 Judah Milgram, Washington DC
 # 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=hebcal
-VERSION=${VERSION:-4.13}
+VERSION=${VERSION:-5.8.4}
 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}
@@ -69,32 +79,22 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Set the default city - see cities.h for list.
-# (New York is the distribution build default)
-CITY=${CITY:-"New York"}
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --mandir=/usr/man \
-  --with-default-city="${CITY}" \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
+make clean
+make DEFAULT_CITY="${DEFAULT_CITY:-New York}" all
+make install  DESTDIR=$PKG PREFIX=/usr MANDIR=/man
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-   AUTHORS COPYING NEWS.md README.md cities.h \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+   AUTHORS COPYING \
+   NEWS.md README.md README_DE.md \
+   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/office/hebcal/hebcal.info b/office/hebcal/hebcal.info
index 1fb679f4cc..bd846f59e7 100644
--- a/office/hebcal/hebcal.info
+++ b/office/hebcal/hebcal.info
@@ -1,10 +1,10 @@
 PRGNAM="hebcal"
-VERSION="4.13"
+VERSION="5.8.4"
 HOMEPAGE="http://hebcal.github.io/"
-DOWNLOAD="https://github.com/hebcal/hebcal/archive/v4.13/hebcal-4.13.tar.gz"
-MD5SUM="23fb97bf63cd330d4d0a32b8ba69548a"
+DOWNLOAD="https://github.com/hebcal/hebcal/archive/v5.8.4/hebcal-5.8.4.tar.gz"
+MD5SUM="7a22d277057acac8e33675af009c0d1f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Judah Milgram"
-EMAIL="milgram@cgpp.com"
+EMAIL="milgram at cgpp dot com"
diff --git a/office/hebcal/slack-desc b/office/hebcal/slack-desc
index 19ff93b3d4..cc73dde681 100644
--- a/office/hebcal/slack-desc
+++ b/office/hebcal/slack-desc
@@ -10,8 +10,8 @@ hebcal: hebcal (perpetual Jewish calendar)
 hebcal:
 hebcal: by Danny Sadinoff
 hebcal:
-hebcal: Prints out the days in the Jewish calendar for a given Gregorian year.
-hebcal:
+hebcal: Prints Hebrew calendar info for Gregorian date range.
+hebcal: Holidays, candle lighting times, yahrzeits, weekly parshas etc.
 hebcal:
 hebcal: Home page: http://hebcal.github.io/
 hebcal: