5 files changed, 29 insertions, 98 deletions
diff --git a/development/asl/README b/development/asl/README
index fb95769c32..663b16f0ae 100644
--- a/development/asl/README
+++ b/development/asl/README
@@ -11,17 +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:
+Build option:
 
-UTF8=yes - Set this in the environment if you want ASL to use UTF-8 for
-its log and error messages. By default, ISO-8859-1 is used.
-
-TESTS=no - Don't run ASL's test suite. This should only be used on slow
-systems to save building time.
-
-DOCTYPES - ASL's documentation can be installed as HTML, PDF,
-PostScript, and/or plain text. DOCTYPES is a space-separated
-list of formats, which may include any of: html pdf ps txt. The
-default is "html". If you plan to print a copy of the docs, you
-might want e.g. DOCTYPES="html pdf".  All formats are installed to
-/usr/doc/asl-$VERSION/, as usual.
+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 ec59ffca1b..09f1aae3a1 100644
--- a/development/asl/asl.SlackBuild
+++ b/development/asl/asl.SlackBuild
@@ -3,10 +3,15 @@
 # Slackware build script for asl
 # Originally written by Oleg O. Chukaev <email removed>
 
-# Modified and currently maintained by B. Watson <yalhcru@gmail.com>.
+# Modified and currently maintained by B. Watson <urchlay@slackware.uk>.
 # 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.
 # 20191202 bkw: update for 142_bld150.
 # 20180911 bkw: update for 142_bld137.
@@ -29,7 +34,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=asl
 SRCNAM=asl-current
-VERSION=${VERSION:-142_bld178}
+VERSION=${VERSION:-142_bld235}
 SRCVER=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -43,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
@@ -81,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," \
@@ -88,75 +92,24 @@ sed -e "/^CFLAGS/s,=.*,= $SLKCFLAGS," \
     < Makefile.def.tmpl \
     > Makefile.def
 
-# 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
-
-# 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
-
-# 20191202 bkw: even after all that, I have to do this:
-rm -f $PKG/usr/doc/$PRGNAM-$VERSION/*.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
+  make -j1 test > $PKGDOC/test_suite.log 2>&1
+
+# no, they're not MS Word docs:
+rename .doc .txt $PKGDOC/*.doc
+
+# and we don't need these:
+rm -f $PKGDOC/*.tex
+
+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 eac582d044..d17a1553da 100644
--- a/development/asl/asl.info
+++ b/development/asl/asl.info
@@ -1,10 +1,10 @@
 PRGNAM="asl"
-VERSION="142_bld178"
+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-bld178.tar.bz2"
-MD5SUM="742f3ed7090c71c15dd6d75a08e9f7b1"
+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=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/development/asl/fixup_manpage_install.diff b/development/asl/fixup_manpage_install.diff
deleted file mode 100644
index 3da6b3938a..0000000000
--- a/development/asl/fixup_manpage_install.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur asl-current.orig/install.sh asl-current/install.sh
---- asl-current.orig/install.sh	2006-05-01 05:31:10.000000000 -0500
-+++ asl-current/install.sh	2009-08-10 11:56:52.645489939 -0500
-@@ -54,7 +54,7 @@
-  for i in man/*.1; do
-   echo ${MANPATH}/man1/`basename $i`
-   cp $i ${MANPATH}/man1
--  chmod 644 ${MANPATH}/man1/$i
-+  chmod 644 ${MANPATH}/man1/`basename $i`
-  done
- fi
- 
diff --git a/development/asl/slack-desc b/development/asl/slack-desc
index b56840ea17..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@"  DOCTYPES="@DOCTYPES@"
+asl:
 asl: