summaryrefslogtreecommitdiff
path: root/development/asl
diff options
context:
space:
mode:
Diffstat (limited to 'development/asl')
-rw-r--r--development/asl/README15
-rw-r--r--development/asl/asl.SlackBuild89
-rw-r--r--development/asl/asl.info8
-rw-r--r--development/asl/fixup_manpage_install.diff12
-rw-r--r--development/asl/slack-desc2
5 files changed, 61 insertions, 65 deletions
diff --git a/development/asl/README b/development/asl/README
index fb95769c32..06a97d1b28 100644
--- a/development/asl/README
+++ b/development/asl/README
@@ -13,15 +13,8 @@ every month or so.
Build options:
-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.
+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.
-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..fd7d38cd3a 100644
--- a/development/asl/asl.SlackBuild
+++ b/development/asl/asl.SlackBuild
@@ -7,6 +7,8 @@
# Original version had no license. Modified version released under the
# WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 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 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=asl
SRCNAM=asl-current
-VERSION=${VERSION:-142_bld178}
+VERSION=${VERSION:-142_bld207}
SRCVER=$(echo $VERSION | tr _ -)
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -88,6 +90,9 @@ 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" ] && \
@@ -106,44 +111,52 @@ 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
+# 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
-done
+fi
# 20191202 bkw: even after all that, I have to do this:
rm -f $PKG/usr/doc/$PRGNAM-$VERSION/*.tex
diff --git a/development/asl/asl.info b/development/asl/asl.info
index eac582d044..3477ea6b93 100644
--- a/development/asl/asl.info
+++ b/development/asl/asl.info
@@ -1,8 +1,10 @@
PRGNAM="asl"
-VERSION="142_bld178"
+VERSION="142_bld207"
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-bld207.tar.bz2 \
+ https://slackware.uk/~urchlay/src/asl-doc-142_bld207.tar.xz"
+MD5SUM="9b7e64d79063dcd7d56bca3f8c4c0223 \
+ c5c04054ae5ebe1e01086a2c918fd309"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
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..b0d14c1caf 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: Build options: UTF8="@UTF8@"
asl:
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-16 00:47:38 +0000