1 files changed, 33 insertions, 23 deletions
diff --git a/development/f2c/f2c.SlackBuild b/development/f2c/f2c.SlackBuild
index 4106279e3f..ca3b3d691d 100644
--- a/development/f2c/f2c.SlackBuild
+++ b/development/f2c/f2c.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for f2c
 
-# Copyright 2017, Judah Milgram, Washington DC
+# Copyright 2017-2023, 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=f2c
-VERSION=${VERSION:-20160102} # This is the f2c version, not libf2c.
+VERSION=${VERSION:-20240130} # f2c version, not libf2c.
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+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}
@@ -66,7 +73,7 @@ cd $PRGNAM-$VERSION/libf2c
 unzip $CWD/libf2c.zip
 
 cd $TMP/$PRGNAM-$VERSION
-tar xvf $CWD/src.tgz
+tar xfvz $CWD/src.tgz
 
 chown -R root:root .
 find -L . \
@@ -75,46 +82,49 @@ 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 {} \;
 
-# libf2c
-
+# make libf2c:
 cd $TMP/$PRGNAM-$VERSION/libf2c
 make CFLAGS="${SLKCFLAGS}" -f makefile.u
 
+# install libf2c:
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
 make -f makefile.u LIBDIR=$PKG/usr/lib${LIBDIRSUFFIX} install
-strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/libf2c.a
-
-# f2c
 
+# make f2c:
 cd $TMP/$PRGNAM-$VERSION/src
 make CFLAGS="${SLKCFLAGS}" -f makefile.u
 
+# install f2c:
 mkdir -p $PKG/usr/bin
+mkdir -p $PKG/usr/include
 install -s f2c $PKG/usr/bin
-strip --strip-unneeded $PKG/usr/bin/f2c
+install -m 644 f2c.h $PKG/usr/include
 
-mkdir -p $PKG/usr/include
-install f2c.h $PKG/usr/include
+# strip binaries:
+strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/libf2c.a
+strip --strip-unneeded $PKG/usr/bin/f2c
 
+# install f2c man page:
+cd $TMP
 mkdir -p $PKG/usr/man/man1
-install f2c.1 $PKG/usr/man/man1/f2c.1
+install -m 644 $PRGNAM-$VERSION/src/f2c.1t $PKG/usr/man/man1/f2c.1
 gzip -9 $PKG/usr/man/man1/f2c.1
 
-
-cd $TMP/$PRGNAM-$VERSION
-
+# install docs:
+cd $TMP
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a src/Notice src/changes $PKG/usr/doc/$PRGNAM-$VERSION
-
-cp -a src/README $PKG/usr/doc/$PRGNAM-$VERSION/README.f2c
-cp -a libf2c/README $PKG/usr/doc/$PRGNAM-$VERSION/README.libf2c
-
+cp -a $PRGNAM-$VERSION/src/Notice $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PRGNAM-$VERSION/src/README $PKG/usr/doc/$PRGNAM-$VERSION/README.f2c
+cp -a $PRGNAM-$VERSION/src/changes $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PRGNAM-$VERSION/libf2c/README $PKG/usr/doc/$PRGNAM-$VERSION/README.libf2c
 cat $CWD/fc > $PKG/usr/doc/$PRGNAM-$VERSION/fc
 cat $CWD/f2c.pdf > $PKG/usr/doc/$PRGNAM-$VERSION/f2c.pdf
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# Copy the slack-desc into ./install
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
+# Make the package
 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