development/asl: Updated for version 142_bld235.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 21 insertions, 86 deletions

diff --git a/development/asl/README b/development/asl/README
index 06a97d1b28..663b16f0ae 100644
--- a/development/asl/README
+++ b/development/asl/README
@@ -11,10 +11,7 @@ Note: The source downloaded is a snapshot. There hasn't been an ASL
 release since 1999, although development snapshots are still released
 every month or so.
 
-Build options:
-
-UTF8=no - Set this in the environment if you want ASL to use
-ISO-8859-1 for its log and error messages. By default, UTF-8 is used.
+Build option:
 
 TESTS=no - Don't run ASL's test suite. This should only be used on
 slow systems to save building time.
diff --git a/development/asl/asl.SlackBuild b/development/asl/asl.SlackBuild
index 0a5dac177c..09f1aae3a1 100644
--- a/development/asl/asl.SlackBuild
+++ b/development/asl/asl.SlackBuild
@@ -7,6 +7,9 @@
 # Original version had no license. Modified version released under the
 # WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230114 bkw: update for 142_bld235.
+# - docs build again (on 15.0), let 'em, no more prebuilt docs.
+# - UTF8 option removed, as upstream no longer supports it.
 # 20210829 bkw: update for 142_bld207.
 # - docs won't build on -current's texlive, use prebuilt (on 14.2).
 # 20201106 bkw: update for 142_bld178.
@@ -31,7 +34,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=asl
 SRCNAM=asl-current
-VERSION=${VERSION:-142_bld207}
+VERSION=${VERSION:-142_bld235}
 SRCVER=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -45,9 +48,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# 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
@@ -83,6 +83,8 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
 sed -e "/^CFLAGS/s,=.*,= $SLKCFLAGS," \
     -e 's,/local,,' \
     -e "s,/lib,&$LIBDIRSUFFIX," \
@@ -90,86 +92,24 @@ sed -e "/^CFLAGS/s,=.*,= $SLKCFLAGS," \
     < Makefile.def.tmpl \
     > Makefile.def
 
-BUILD_DOCS="${BUILD_DOCS:-no}"
-[ "$BUILD_DOCS" = "no" ] && sed -i '/^all:/s, *docs,,' Makefile
-
-# Slackware standard is still non-utf8 locales in 14.2.
-UTF8="${UTF8:-no}"
-[ "$UTF8" = "yes" ] && \
-  sed -i 's/CHARSET_ISO8859_1/CHARSET_UTF8/' Makefile.def
-
 # binaries are already stripped, no symlinks in man pages.
-# 20201106 bkw: upstream changed PREFIX to INSTROOT, support both
-# in case someone wants to build an old version.
-DESTDIR=PREFIX
-grep -q INSTROOT Makefile && DESTDIR=INSTROOT
-make -j1 binaries install $DESTDIR=$PKG DOCPATH=""
+make -j1 install INSTROOT=$PKG DOCPATH=""
 gzip -9 $PKG/usr/man/man?/*.?
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-
 [ "${TESTS:-yes}" = "yes" ] && \
-  make -j1 test > $PKG/usr/doc/$PRGNAM-$VERSION/test_suite.log 2>&1
-
-# 20210829 bkw: docs won't build on -current (aka 15.0rc1). I don't
-# speak TeX and don't have time to learn it, so I prebuilt the docs
-# on a 14.2 box and made a tarball.
-if [ "$BUILD_DOCS" = "no" ]; then
-  tar xvf $CWD/$PRGNAM-doc-$VERSION.tar.xz
-  install -m0644 -oroot -groot $PRGNAM-doc-$VERSION/* $PKG/usr/doc/$PRGNAM-$VERSION
-else
-  # Don't use 'make docs', we don't need to waste time converting the
-  # same documentation into multiple formats (html, ps, pdf, plain text)
-  # unless the user really wants to. Also, "make docs" followed by "make
-  # install" results in a mess, the /usr/doc dir ends up containing all
-  # the converted formats, plus the TeX source, plus all the temporary
-  # files created during the doc build. The stuff below is more work than
-  # I really wanted to do, but...
-
-  DOCTYPES="${DOCTYPES:-html}"
-
-  for doctype in $DOCTYPES; do
-    for lang in EN DE; do
-      case "$doctype" in
-        html)
-          make tex2html
-          make -C doc_$lang as.html TEX2HTML=../tex2html
-          cat doc_$lang/as.html > $PKG/usr/doc/$PRGNAM-$VERSION/as-$lang.html
-          ;;
-        pdf)
-          make -C doc_$lang as.pdf TEX2HTML=../tex2html
-          cat doc_$lang/as.pdf > $PKG/usr/doc/$PRGNAM-$VERSION/as-$lang.pdf
-          ;;
-        ps)
-          make -C doc_$lang as.ps TEX2HTML=../tex2html
-          cat doc_$lang/as.ps > $PKG/usr/doc/$PRGNAM-$VERSION/as-$lang.ps
-          ;;
-        txt)
-          make tex2doc
-          make -C doc_$lang as.doc TEX2DOC=../tex2doc
-          cat doc_$lang/as.doc > $PKG/usr/doc/$PRGNAM-$VERSION/as-$lang.txt
-          ;;
-        *)
-          echo "Unknown value for DOCTYPES, valid types are: html pdf ps txt" 1>&2
-          exit 1
-          ;;
-      esac
-    done
-  done
-fi
+  make -j1 test > $PKGDOC/test_suite.log 2>&1
+
+# no, they're not MS Word docs:
+rename .doc .txt $PKGDOC/*.doc
 
-# 20191202 bkw: even after all that, I have to do this:
-rm -f $PKG/usr/doc/$PRGNAM-$VERSION/*.tex
+# and we don't need these:
+rm -f $PKGDOC/*.tex
 
-cp -a BENCHES README README.LANGS TODO changelog \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a BENCHES README README.LANGS TODO changelog $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-sed -e "s,@UTF8@,$UTF8," \
-    -e "s,@DOCTYPES@,$DOCTYPES," \
-    $CWD/slack-desc \
-    > $PKG/install/slack-desc
+cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/asl/asl.info b/development/asl/asl.info
index 7ed22dc98a..d17a1553da 100644
--- a/development/asl/asl.info
+++ b/development/asl/asl.info
@@ -1,10 +1,8 @@
 PRGNAM="asl"
-VERSION="142_bld207"
+VERSION="142_bld235"
 HOMEPAGE="http://john.ccac.rwth-aachen.de:8000/as/"
-DOWNLOAD="http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current-142-bld207.tar.bz2 \
-          https://slackware.uk/~urchlay/src/asl-doc-142_bld207.tar.xz"
-MD5SUM="9b7e64d79063dcd7d56bca3f8c4c0223 \
-        c5c04054ae5ebe1e01086a2c918fd309"
+DOWNLOAD="http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current-142-bld235.tar.gz"
+MD5SUM="6019745dc328a41bc034cc21b8bff15a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/asl/slack-desc b/development/asl/slack-desc
index b0d14c1caf..c81dbb1fa8 100644
--- a/development/asl/slack-desc
+++ b/development/asl/slack-desc
@@ -15,5 +15,5 @@ asl: CPU families in the target list that are used in workstations and PCs.
 asl:
 asl: Homepage: http://john.ccac.rwth-aachen.de:8000/as/
 asl:
-asl: Build options: UTF8="@UTF8@"
+asl:
 asl: