summaryrefslogtreecommitdiffstats
path: root/development
diff options
context:
space:
mode:
Diffstat (limited to 'development')
-rw-r--r--development/CImg/CImg.SlackBuild2
-rw-r--r--development/CImg/CImg.info6
-rw-r--r--development/Naked/Naked.SlackBuild1
-rw-r--r--development/Naked/doinst.sh3
-rw-r--r--development/ShellCheck-bin/ShellCheck-bin.SlackBuild2
-rw-r--r--development/ShellCheck-bin/ShellCheck-bin.info6
-rw-r--r--development/Sphinx/Sphinx.SlackBuild2
-rw-r--r--development/Sphinx/Sphinx.info6
-rw-r--r--development/acpica/acpica.SlackBuild28
-rw-r--r--development/acpica/acpica.info6
-rw-r--r--development/android-tools/README4
-rw-r--r--development/android-tools/android-tools.SlackBuild83
-rw-r--r--development/android-tools/android-tools.info26
-rw-r--r--development/android-tools/bash_completion.fastboot90
-rw-r--r--development/android-tools/fix_build_core.patch104
-rw-r--r--development/android-tools/generate_build.rb466
-rw-r--r--development/apache-maven/apache-maven.SlackBuild2
-rw-r--r--development/apache-maven/apache-maven.info6
-rw-r--r--development/as31/as31.SlackBuild3
-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
-rw-r--r--development/astyle/README8
-rw-r--r--development/astyle/astyle.SlackBuild3
-rw-r--r--development/atasm/atasm.SlackBuild10
-rw-r--r--development/bats-core/README (renamed from development/bats/README)0
-rw-r--r--development/bats-core/bats-core.SlackBuild (renamed from development/bats/bats.SlackBuild)53
-rw-r--r--development/bats-core/bats-core.info10
-rw-r--r--development/bats-core/slack-desc19
-rw-r--r--development/bats/bats.info10
-rw-r--r--development/bats/slack-desc19
-rw-r--r--development/beav/beav.SlackBuild3
-rw-r--r--development/beav/beav.info4
-rw-r--r--development/bed/bed.SlackBuild3
-rw-r--r--development/blassic/blassic.SlackBuild10
-rw-r--r--development/blassic/blassic.info4
-rw-r--r--development/bless/bless.SlackBuild6
-rw-r--r--development/bmake/README2
-rw-r--r--development/bmake/bmake.SlackBuild10
-rw-r--r--development/bmake/bmake.info8
-rw-r--r--development/bsdiff/bsdiff.SlackBuild3
-rw-r--r--development/bsdiff/bsdiff.info4
-rw-r--r--development/bviplus/bviplus.SlackBuild3
-rw-r--r--development/byacc/byacc.SlackBuild2
-rw-r--r--development/byacc/byacc.info4
-rw-r--r--development/cc65/cc65.SlackBuild3
-rw-r--r--development/codespell/codespell.SlackBuild15
-rw-r--r--development/codespell/codespell.info6
-rw-r--r--development/cproto/cproto.SlackBuild5
-rw-r--r--development/cproto/cproto.info6
-rw-r--r--development/d-tools/d-tools.SlackBuild8
-rw-r--r--development/d-tools/d-tools.info18
-rw-r--r--development/dhex/010_fix-typos.patch177
-rw-r--r--development/dhex/dhex.SlackBuild14
-rw-r--r--development/dhex/dhex.info4
-rw-r--r--development/dis/dis.1192
-rw-r--r--development/dis/dis.SlackBuild12
-rw-r--r--development/dis/dis.rst154
-rw-r--r--development/dis6502/dis6502.SlackBuild5
-rw-r--r--development/dkms/dkms.SlackBuild4
-rw-r--r--development/dkms/dkms.info6
-rw-r--r--development/dmd/dmd.SlackBuild2
-rw-r--r--development/dmd/dmd.info6
-rw-r--r--development/eclim/630fbcd5e6caa810f721b0f0de9478aaf78f7958.patch.gzbin1493 -> 0 bytes
-rw-r--r--development/eclim/README17
-rw-r--r--development/eclim/eclim.SlackBuild167
-rw-r--r--development/eclim/eclim.info12
-rw-r--r--development/eclim/slack-desc19
-rw-r--r--development/eclim/sphinx2.patch.gzbin584 -> 0 bytes
-rw-r--r--development/eclipse-cpp/eclipse-cpp.SlackBuild4
-rw-r--r--development/eclipse-cpp/eclipse-cpp.desktop2
-rw-r--r--development/eclipse-cpp/eclipse-cpp.info6
-rw-r--r--development/eclipse-java/eclipse-java.SlackBuild4
-rw-r--r--development/eclipse-java/eclipse-java.info6
-rw-r--r--development/eclipse-jee/eclipse-jee.SlackBuild4
-rw-r--r--development/eclipse-jee/eclipse-jee.desktop2
-rw-r--r--development/eclipse-jee/eclipse-jee.info6
-rw-r--r--development/eclipse-php/eclipse-php.SlackBuild4
-rw-r--r--development/eclipse-php/eclipse-php.desktop2
-rw-r--r--development/eclipse-php/eclipse-php.info6
-rw-r--r--development/erlang-otp/erlang-otp.info6
-rw-r--r--development/erlang-otp/slack-desc2
-rw-r--r--development/ex-vi/ex-vi.SlackBuild16
-rw-r--r--development/ex-vi/ex-vi.info2
-rw-r--r--development/fpc/README2
-rw-r--r--development/fpc/doinst.sh4
-rw-r--r--development/fpc/fix-IDE-data-file-location.patch69
-rw-r--r--development/fpc/fpc.SlackBuild103
-rw-r--r--development/fpc/fpc.info22
-rw-r--r--development/fpc/instantfpc.182
-rw-r--r--development/fpc/slack-desc2
-rw-r--r--development/frobtads/frobtads.SlackBuild45
-rw-r--r--development/frobtads/frobtads.info6
-rw-r--r--development/ftnchek/ftnchek.SlackBuild10
-rw-r--r--development/ftnchek/ftnchek.info4
-rw-r--r--development/gcc5/gcc5.SlackBuild27
-rw-r--r--development/gcc5/patches/glibc2.30-ipc_perm.diff12
-rw-r--r--development/gcc5/patches/kernel-5.12.diff37
-rw-r--r--development/ghex/ghex.SlackBuild16
-rw-r--r--development/ghex/ghex.info6
-rw-r--r--development/github-cli/github-cli.SlackBuild2
-rw-r--r--development/github-cli/github-cli.info10
-rw-r--r--development/gnulib/gnulib.SlackBuild3
-rw-r--r--development/gnulib/gnulib.info2
-rw-r--r--development/gnuradio/gnuradio.info2
-rw-r--r--development/gr-osmosdr/gr-osmosdr.info2
-rw-r--r--development/gsoap/gsoap.SlackBuild33
-rw-r--r--development/gsoap/gsoap.info6
-rw-r--r--development/gsoap/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch12
-rw-r--r--development/guile1.8/guile1.8.SlackBuild2
-rw-r--r--development/hexcurse/hexcurse.SlackBuild5
-rw-r--r--development/hexe/hexe.SlackBuild5
-rw-r--r--development/hexer/hexer.SlackBuild3
-rw-r--r--development/hexer/hexer.info2
-rw-r--r--development/hexinator/hexinator.SlackBuild3
-rw-r--r--development/hopper/hopper.SlackBuild2
-rw-r--r--development/hopper/hopper.info6
-rw-r--r--development/icdiff/fix-pipe-handling-installed.patch51
-rw-r--r--development/icdiff/icdiff.147
-rw-r--r--development/icdiff/icdiff.SlackBuild23
-rw-r--r--development/icdiff/icdiff.info6
-rw-r--r--development/icdiff/icdiff.rst6
-rw-r--r--development/icemon/icemon.SlackBuild49
-rw-r--r--development/icemon/icemon.info6
-rw-r--r--development/icemon/slack-desc10
-rw-r--r--development/inform/destdir.diff123
-rw-r--r--development/inform/inform.SlackBuild45
-rw-r--r--development/inform/inform.info6
-rw-r--r--development/inform/parallel_make.diff20
-rw-r--r--development/jdk11/jdk11.SlackBuild6
-rw-r--r--development/jdk11/jdk11.info6
-rw-r--r--development/jeex/jeex.SlackBuild46
-rw-r--r--development/kdiff3/README33
-rw-r--r--development/kdiff3/kdiff3.SlackBuild6
-rw-r--r--development/kdiff3/kdiff3.info8
-rw-r--r--development/kdiff3/slack-desc4
-rw-r--r--development/kotlin/kotlin.SlackBuild2
-rw-r--r--development/kotlin/kotlin.info6
-rw-r--r--development/lazarus/README2
-rw-r--r--development/lazarus/lazarus.SlackBuild45
-rw-r--r--development/lazarus/lazarus.info14
-rw-r--r--development/lazarus/slack-desc2
-rw-r--r--development/love-legacy072/love-legacy072.SlackBuild18
-rw-r--r--development/love-legacy072/love-legacy072.info2
-rw-r--r--development/love-legacy072/newmesafix.diff15
-rw-r--r--development/love-legacy080/love-legacy080.SlackBuild15
-rw-r--r--development/love-legacy080/love-legacy080.info2
-rw-r--r--development/love-legacy080/newmesafix.diff15
-rw-r--r--development/love/love.SlackBuild7
-rw-r--r--development/love/love.info4
-rw-r--r--development/ltrace/ltrace.SlackBuild10
-rw-r--r--development/ltrace/ltrace.info6
-rw-r--r--development/mads/mads.SlackBuild22
-rw-r--r--development/mads/mads.info10
-rw-r--r--development/mawk/mawk.SlackBuild3
-rw-r--r--development/mawk/mawk.info2
-rw-r--r--development/meld3/meld3.SlackBuild2
-rw-r--r--development/meld3/meld3.info6
-rw-r--r--development/mongodb-compass/mongodb-compass.SlackBuild2
-rw-r--r--development/mongodb-compass/mongodb-compass.info6
-rw-r--r--development/nchexedit/nchexedit.SlackBuild24
-rw-r--r--development/nchexedit/nchexedit.info10
-rw-r--r--development/neovim/neovim.SlackBuild1
-rw-r--r--development/neovim/neovim.info4
-rw-r--r--development/nodejs/nodejs.SlackBuild3
-rw-r--r--development/nodejs/nodejs.info6
-rw-r--r--development/noweb/noweb.SlackBuild94
-rw-r--r--development/noweb/noweb.info8
-rw-r--r--development/noweb/patches/make_cleanup.diff (renamed from development/noweb/make_cleanup.diff)680
-rw-r--r--development/noweb/patches/toascii.diff143
-rw-r--r--development/numpy3/numpy3.SlackBuild2
-rw-r--r--development/numpy3/numpy3.info6
-rw-r--r--development/obcpl/README17
-rw-r--r--development/obcpl/examples/Makefile17
-rw-r--r--development/obcpl/examples/README14
-rw-r--r--development/obcpl/examples/factorial.b9
-rw-r--r--development/obcpl/examples/hello.b6
-rw-r--r--development/obcpl/fix_segfault.diff12
-rw-r--r--development/obcpl/obcpl.SlackBuild49
-rw-r--r--development/opencomal/opencomal.SlackBuild3
-rw-r--r--development/pcc/README39
-rw-r--r--development/pcc/pcc.SlackBuild62
-rw-r--r--development/pcc/pcc.info10
-rw-r--r--development/pcc/slack-desc2
-rw-r--r--development/php-xdebug/README (renamed from development/xdebug/README)0
-rw-r--r--development/php-xdebug/doinst.sh (renamed from development/xdebug/doinst.sh)0
-rw-r--r--development/php-xdebug/php-xdebug.SlackBuild (renamed from development/xdebug/xdebug.SlackBuild)44
-rw-r--r--development/php-xdebug/php-xdebug.info (renamed from development/xdebug/xdebug.info)2
-rw-r--r--development/php-xdebug/slack-desc19
-rw-r--r--development/php-xdebug/xdebug.ini2
-rw-r--r--development/pkgdiff/pkgdiff.SlackBuild10
-rw-r--r--development/portaudio/portaudio.SlackBuild16
-rw-r--r--development/portaudio/portaudio.info8
-rw-r--r--development/portaudio/slack-desc2
-rw-r--r--development/postman/postman.SlackBuild2
-rw-r--r--development/postman/postman.info10
-rw-r--r--development/pycharm/pycharm.SlackBuild4
-rw-r--r--development/pycharm/pycharm.info6
-rw-r--r--development/python3-matplotlib/python3-matplotlib.SlackBuild8
-rw-r--r--development/python3-matplotlib/python3-matplotlib.info6
-rw-r--r--development/reflex/reflex.SlackBuild5
-rw-r--r--development/reflex/reflex.info8
-rw-r--r--development/rmac/rmac.SlackBuild6
-rw-r--r--development/rmac/rmac.info8
-rw-r--r--development/robotframework/robotframework.SlackBuild2
-rw-r--r--development/robotframework/robotframework.info6
-rw-r--r--development/sbcl/sbcl.SlackBuild2
-rw-r--r--development/sbcl/sbcl.info6
-rw-r--r--development/sloccount/sloccount.SlackBuild24
-rw-r--r--development/sloccount/sloccount.info4
-rw-r--r--development/source-highlight/gcc11.patch34
-rw-r--r--development/source-highlight/source-highlight.SlackBuild17
-rw-r--r--development/srecord/README2
-rw-r--r--development/srecord/slack-desc2
-rw-r--r--development/srecord/srecord.SlackBuild46
-rw-r--r--development/srecord/srecord.info2
-rw-r--r--development/systemtap/int.patch48
-rw-r--r--development/systemtap/systemtap.SlackBuild9
-rw-r--r--development/systemtap/systemtap.info6
-rw-r--r--development/tea/tea.SlackBuild2
-rw-r--r--development/tea/tea.info8
-rw-r--r--development/tiled/tiled.SlackBuild2
-rw-r--r--development/tiled/tiled.info6
-rw-r--r--development/tweak/20200601.diff1315
-rw-r--r--development/tweak/README2
-rw-r--r--development/tweak/slack-desc2
-rw-r--r--development/tweak/tweak.SlackBuild20
-rw-r--r--development/tweak/tweak.info2
-rw-r--r--development/uncrustify/uncrustify.SlackBuild2
-rw-r--r--development/uncrustify/uncrustify.info6
-rw-r--r--development/unifdef/unifdef.SlackBuild3
-rw-r--r--development/unifdef/unifdef.info4
-rw-r--r--development/vscode-bin/vscode-bin.SlackBuild4
-rw-r--r--development/vscode-bin/vscode-bin.info6
-rw-r--r--development/wheel/doinst.sh3
-rw-r--r--development/wheel/wheel.SlackBuild1
-rw-r--r--development/xa/xa.SlackBuild3
-rw-r--r--development/xa/xa.info2
-rw-r--r--development/xasm/xasm.SlackBuild10
-rw-r--r--development/xdebug/slack-desc19
-rw-r--r--development/xdebug/xdebug.ini2
-rw-r--r--development/xnedit/xnedit.SlackBuild2
-rw-r--r--development/xnedit/xnedit.info6
-rw-r--r--development/xtruss/slack-desc2
-rw-r--r--development/xtruss/xtruss.SlackBuild8
-rw-r--r--development/xtruss/xtruss.info6
-rw-r--r--development/xvi/README2
-rw-r--r--development/xvi/slack-desc2
-rw-r--r--development/xvi/xvi.SlackBuild3
-rw-r--r--development/z88dk/z88dk.SlackBuild6
-rw-r--r--development/zeal/064aaa05d6a3ba4ba3cf648199a3109aba2f41fe.diff.gzbin0 -> 257 bytes
-rw-r--r--development/zeal/zeal.SlackBuild4
254 files changed, 4114 insertions, 2308 deletions
diff --git a/development/CImg/CImg.SlackBuild b/development/CImg/CImg.SlackBuild
index 047b36d5f5..419f90f4b8 100644
--- a/development/CImg/CImg.SlackBuild
+++ b/development/CImg/CImg.SlackBuild
@@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=CImg
-VERSION=${VERSION:-2.9.6}
+VERSION=${VERSION:-2.9.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/CImg/CImg.info b/development/CImg/CImg.info
index e0634719e4..db65b2591b 100644
--- a/development/CImg/CImg.info
+++ b/development/CImg/CImg.info
@@ -1,8 +1,8 @@
PRGNAM="CImg"
-VERSION="2.9.6"
+VERSION="2.9.8"
HOMEPAGE="http://cimg.eu/"
-DOWNLOAD="http://cimg.eu/files/CImg_2.9.6.zip"
-MD5SUM="8e383752a2a9b1f42da3aac5c4180cf9"
+DOWNLOAD="http://cimg.eu/files/CImg_2.9.8.zip"
+MD5SUM="6519f096e1a3de31c8a5f5e37ec937ab"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/Naked/Naked.SlackBuild b/development/Naked/Naked.SlackBuild
index 8f6897aa56..a4cc093eec 100644
--- a/development/Naked/Naked.SlackBuild
+++ b/development/Naked/Naked.SlackBuild
@@ -90,7 +90,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/Naked/doinst.sh b/development/Naked/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/development/Naked/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
diff --git a/development/ShellCheck-bin/ShellCheck-bin.SlackBuild b/development/ShellCheck-bin/ShellCheck-bin.SlackBuild
index 61bcfbf7cd..4b317b48d6 100644
--- a/development/ShellCheck-bin/ShellCheck-bin.SlackBuild
+++ b/development/ShellCheck-bin/ShellCheck-bin.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=ShellCheck-bin
BINNAM=shellcheck
-VERSION=${VERSION:-0.7.1}
+VERSION=${VERSION:-0.7.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/ShellCheck-bin/ShellCheck-bin.info b/development/ShellCheck-bin/ShellCheck-bin.info
index 62d1f598e6..81b7876173 100644
--- a/development/ShellCheck-bin/ShellCheck-bin.info
+++ b/development/ShellCheck-bin/ShellCheck-bin.info
@@ -1,10 +1,10 @@
PRGNAM="ShellCheck-bin"
-VERSION="0.7.1"
+VERSION="0.7.2"
HOMEPAGE="https://www.shellcheck.net"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.x86_64.tar.xz"
-MD5SUM_x86_64="76a9225cf936edfff4e8f124097f4215"
+DOWNLOAD_x86_64="https://github.com/koalaman/shellcheck/releases/download/v0.7.2/shellcheck-v0.7.2.linux.x86_64.tar.xz"
+MD5SUM_x86_64="03f5938ba5154e136ef203f29abe86d6"
REQUIRES=""
MAINTAINER="Dave Woodfall"
EMAIL="dave@slackbuilds.org"
diff --git a/development/Sphinx/Sphinx.SlackBuild b/development/Sphinx/Sphinx.SlackBuild
index 03fd403dab..87caf8736b 100644
--- a/development/Sphinx/Sphinx.SlackBuild
+++ b/development/Sphinx/Sphinx.SlackBuild
@@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=Sphinx
-VERSION=${VERSION:-4.0.2}
+VERSION=${VERSION:-4.2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/Sphinx/Sphinx.info b/development/Sphinx/Sphinx.info
index 52ab4a063b..86c8dd3c2d 100644
--- a/development/Sphinx/Sphinx.info
+++ b/development/Sphinx/Sphinx.info
@@ -1,8 +1,8 @@
PRGNAM="Sphinx"
-VERSION="4.0.2"
+VERSION="4.2.0"
HOMEPAGE="http://www.sphinx-doc.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-4.0.2.tar.gz"
-MD5SUM="025cf3c9c173872924f7c4d96a878b65"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-4.2.0.tar.gz"
+MD5SUM="6af34550e36dd6d58a496e47ec67280f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="alabaster imagesize python3-babel Jinja2 snowballstemmer sphinxcontrib-applehelp sphinxcontrib-devhelp sphinxcontrib-htmlhelp sphinxcontrib-jsmath sphinxcontrib-qthelp sphinxcontrib-serializinghtml"
diff --git a/development/acpica/acpica.SlackBuild b/development/acpica/acpica.SlackBuild
index 29555a11c6..c7a9a00c0d 100644
--- a/development/acpica/acpica.SlackBuild
+++ b/development/acpica/acpica.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for acpica
-# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -11,21 +11,21 @@
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# 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=acpica
-VERSION=${VERSION:-20210331}
+VERSION=${VERSION:-20210730}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -50,8 +50,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/development/acpica/acpica.info b/development/acpica/acpica.info
index 67516e4712..97da5da7cc 100644
--- a/development/acpica/acpica.info
+++ b/development/acpica/acpica.info
@@ -1,8 +1,8 @@
PRGNAM="acpica"
-VERSION="20210331"
+VERSION="20210730"
HOMEPAGE="http://www.acpica.org"
-DOWNLOAD="https://acpica.org/sites/acpica/files/acpica-unix-20210331.tar.gz"
-MD5SUM="bf54ef57eeff1c3be04669d9526a29b3"
+DOWNLOAD="https://acpica.org/sites/acpica/files/acpica-unix-20210730.tar.gz"
+MD5SUM="acedcb5b965f122c8576dbe01502a7e4"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/android-tools/README b/development/android-tools/README
index fa0406782b..6cbb93b0b5 100644
--- a/development/android-tools/README
+++ b/development/android-tools/README
@@ -1,2 +1,2 @@
-These are the adb, fastboot, mkbootimg, unpack_bootimg, mke2fs.android,
-e2fsdroid, avbtool and ext2simg tools from the android sdk.
+These are the adb, append2simg, fastboot, img2simg, mke2fs.android
+and simg2img tools from the android sdk.
diff --git a/development/android-tools/android-tools.SlackBuild b/development/android-tools/android-tools.SlackBuild
index 0e63d70693..5b3eb73f2e 100644
--- a/development/android-tools/android-tools.SlackBuild
+++ b/development/android-tools/android-tools.SlackBuild
@@ -27,17 +27,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=android-tools
-VERSION=${VERSION:-29.0.5}
-SRC1=avb-355c69ae673220da533696c44acbfa489702d1ff.tar.gz
-SRC2=base-d634d2306033599c00b83e68c9ecb60e3206d40c.tar.gz
-SRC3=boringssl-a7a75f208caea8a303615724d4cc5f4e8dfb9695.tar.gz
-SRC4=core-fa4254a53a368a8f9b6604442eace6a7b6b63b6d.tar.gz
-SRC5=e2fsprogs-5fab03bbdc3789515748af8181b9e82dd99beb3b.tar.gz
-SRC6=extras-6748c3dd53494096ffeebfeeb12e3b3efad90a83.tar.gz
-SRC7=f2fs-tools-39ec3b4c2edc136d32392ddc7a7f222b4c68e88c.tar.gz
-SRC8=mkbootimg-e29814dcf6434e8d14379062e4ea1c1b58ff11d0.tar.gz
-SRC9=native-b9005758dcf78f89c6640ffb119b5b527a417928.tar.gz
-SRC10=selinux-9e188fde016babc76150098e0ab288e053cf92e2.tar.gz
+VERSION=${VERSION:-31.0.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -81,68 +71,27 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $TMP/android-tools
-mkdir $TMP/android-tools
-cd $TMP/android-tools
-
-mkdir avb
-tar -xvf $CWD/$SRC1 -C avb
-mkdir base
-tar -xvf $CWD/$SRC2 -C base
-mkdir boringssl
-tar -xvf $CWD/$SRC3 -C boringssl
-mkdir core
-tar -xvf $CWD/$SRC4 -C core
-mkdir e2fsprogs
-tar -xvf $CWD/$SRC5 -C e2fsprogs
-mkdir extras
-tar -xvf $CWD/$SRC6 -C extras
-mkdir f2fs-tools
-tar -xvf $CWD/$SRC7 -C f2fs-tools
-mkdir mkbootimg
-tar -xvf $CWD/$SRC8 -C mkbootimg
-mkdir native
-tar -xvf $CWD/$SRC9 -C native
-mkdir selinux
-tar -xvf $CWD/$SRC10 -C selinux
-cp -a $CWD/deployagent.jar .
-
-# generate_build.rb borrowed from Arch Linux
-# And thanks to Alan Alberghini for the make_ext4fs patch.
-PKGVER=$VERSION LDFLAGS='-Wl,-z,relro,-z,now' ruby $CWD/generate_build.rb > build.ninja
-
-cd core
-patch -p1 < $CWD/fix_build_core.patch
-cd ..
-
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
chown -R root:root .
-find . \
+find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Build boringssl
-mkdir -p boringssl/build
-cd boringssl/build
-cmake -GNinja ..
-"${NINJA:=ninja}"
-$NINJA crypto/libcrypto.a
-cd ../..
-
-$NINJA
-
-mkdir -p $PKG/usr/bin
-install -D -m 0755 adb $PKG/usr/bin/adb
-install -D -m 0755 fastboot $PKG/usr/bin/fastboot
-install -D -m 0755 mke2fs.android $PKG/usr/bin/mke2fs.android
-install -D -m 0755 e2fsdroid $PKG/usr/bin/e2fsdroid
-install -D -m 0755 ext2simg $PKG/usr/bin/ext2simg
-install -D -m 0755 avb/avbtool $PKG/usr/bin/avbtool
-install -D -m 0755 mkbootimg/mkbootimg.py $PKG/usr/bin/mkbootimg
-install -D -m 0755 mkbootimg/unpack_bootimg.py $PKG/usr/bin/unpack_bootimg
-
-install -D -m 0644 $CWD/bash_completion.fastboot $PKG/usr/share/bash-completion/completions/fastboot
+mkdir -p build
+cd build
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -GNinja \
+ -DCMAKE_BUILD_TYPE=Release ..
+ "${NINJA:=ninja}"
+ DESTDIR=$PKG $NINJA install
+cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/development/android-tools/android-tools.info b/development/android-tools/android-tools.info
index 61fbef39ef..cc3ca14508 100644
--- a/development/android-tools/android-tools.info
+++ b/development/android-tools/android-tools.info
@@ -1,28 +1,8 @@
PRGNAM="android-tools"
-VERSION="29.0.5"
+VERSION="31.0.2"
HOMEPAGE="http://developer.android.com/sdk/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/avb-355c69ae673220da533696c44acbfa489702d1ff.tar.gz \
- http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/base-d634d2306033599c00b83e68c9ecb60e3206d40c.tar.gz \
- http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/boringssl-a7a75f208caea8a303615724d4cc5f4e8dfb9695.tar.gz \
- http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/core-fa4254a53a368a8f9b6604442eace6a7b6b63b6d.tar.gz \
- http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/e2fsprogs-5fab03bbdc3789515748af8181b9e82dd99beb3b.tar.gz \
- http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/extras-6748c3dd53494096ffeebfeeb12e3b3efad90a83.tar.gz \
- http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/f2fs-tools-39ec3b4c2edc136d32392ddc7a7f222b4c68e88c.tar.gz \
- http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/mkbootimg-e29814dcf6434e8d14379062e4ea1c1b58ff11d0.tar.gz \
- http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/native-b9005758dcf78f89c6640ffb119b5b527a417928.tar.gz \
- http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/selinux-9e188fde016babc76150098e0ab288e053cf92e2.tar.gz \
- http://ponce.cc/slackware/sources/repo/android-tools/29.0.5/deployagent.jar"
-MD5SUM="6800e83627f1046be645fc8c7ba027d5 \
- e816083df667905b865c248a8a20c2e7 \
- a20c134ee4310e600384b7d0a60c2db6 \
- 34fb01c210c7371833da14f1d7a970e6 \
- 3b559a1c803c94079b177065b7424457 \
- cdd9d7b4956e5da607bb1e94cb929065 \
- 880a1708785515fe1447b1bf6b020093 \
- f912725e4d01596c2a2d0fa3fe772d8e \
- 3daf9cf55dceb85ca06ae116e61800b4 \
- 28a8438bc0856def465f6456781a5275 \
- bb500620af2f3716a61100f7b5c445fa"
+DOWNLOAD="https://github.com/nmeum/android-tools/releases/download/31.0.2/android-tools-31.0.2.tar.xz"
+MD5SUM="abd9ec88b7fcba29601ad6107801f571"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="gtest protobuf3"
diff --git a/development/android-tools/bash_completion.fastboot b/development/android-tools/bash_completion.fastboot
deleted file mode 100644
index bc59ee8636..0000000000
--- a/development/android-tools/bash_completion.fastboot
+++ /dev/null
@@ -1,90 +0,0 @@
-## Bash completion for the Android SDK tools.
-##
-## Copyright (c) 2009 Matt Brubeck
-##
-## Permission is hereby granted, free of charge, to any person obtaining a copy
-## of this software and associated documentation files (the "Software"), to deal
-## in the Software without restriction, including without limitation the rights
-## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-## copies of the Software, and to permit persons to whom the Software is
-## furnished to do so, subject to the following conditions:
-##
-## The above copyright notice and this permission notice shall be included in
-## all copies or substantial portions of the Software.
-##
-## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-## THE SOFTWARE.
-
-
-function _fastboot()
-{
- local cur prev opts cmds c subcommand device_selected
- COMPREPLY=()
- cur="${COMP_WORDS[COMP_CWORD]}"
- prev="${COMP_WORDS[COMP_CWORD-1]}"
- opts="-w -s -p -c -i -b -n"
- cmds="update flashall flash erase getvar boot devices \
- reboot reboot-bootloader oem continue"
- subcommand=""
- partition_list="boot recovery system userdata bootloader radio"
- device_selected=""
-
- # Look for the subcommand.
- c=1
- while [ $c -lt $COMP_CWORD ]; do
- word="${COMP_WORDS[c]}"
- if [ "$word" = "-s" ]; then
- device_selected=true
- fi
- for cmd in $cmds; do
- if [ "$cmd" = "$word" ]; then
- subcommand="$word"
- fi
- done
- c=$((++c))
- done
-
- case "${subcommand}" in
- '')
- case "${prev}" in
- -s)
- # Use 'fastboot devices' to list serial numbers.
- COMPREPLY=( $(compgen -W "$(fastboot devices|cut -f1)" -- ${cur} ) )
- return 0
- ;;
- esac
- case "${cur}" in
- -*)
- COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
- return 0
- ;;
- esac
- if [ -z "$device_selected" ]; then
- local num_devices=$(( $(fastboot devices 2>/dev/null|wc -l) ))
- if [ "$num_devices" -gt "1" ]; then
- # With multiple devices, you must choose a device first.
- COMPREPLY=( $(compgen -W "-s" -- ${cur}) )
- return 0
- fi
- fi
- COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
- return 0
- ;;
- flash)
- # partition name
- COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) )
- return 0
- ;;
- erase)
- # partition name
- COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) )
- return 0
- ;;
- esac
-}
-complete -o default -F _fastboot fastboot
diff --git a/development/android-tools/fix_build_core.patch b/development/android-tools/fix_build_core.patch
deleted file mode 100644
index fede1c09cc..0000000000
--- a/development/android-tools/fix_build_core.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff --git a/adb/adb.cpp b/adb/adb.cpp
-index 1ec145b25c..b6e943f6ee 100644
---- a/adb/adb.cpp
-+++ b/adb/adb.cpp
-@@ -44,8 +44,6 @@
- #include <android-base/parsenetaddress.h>
- #include <android-base/stringprintf.h>
- #include <android-base/strings.h>
--#include <build/version.h>
--#include <platform_tools_version.h>
-
- #include "adb_auth.h"
- #include "adb_io.h"
-@@ -66,10 +64,10 @@ std::string adb_version() {
- // Don't change the format of this --- it's parsed by ddmlib.
- return android::base::StringPrintf(
- "Android Debug Bridge version %d.%d.%d\n"
-- "Version %s-%s\n"
-+ "Version %s\n"
- "Installed as %s\n",
- ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION,
-- PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str(),
-+ PLATFORM_TOOLS_VERSION,
- android::base::GetExecutablePath().c_str());
- }
-
-diff --git a/adb/client/main.cpp b/adb/client/main.cpp
-index 0c5c28f1b3..b6a1281521 100644
---- a/adb/client/main.cpp
-+++ b/adb/client/main.cpp
-@@ -118,10 +118,6 @@ int adb_server_main(int is_daemon, const std::string& socket_spec, int ack_reply
- init_transport_registration();
- init_reconnect_handler();
-
-- if (!getenv("ADB_MDNS") || strcmp(getenv("ADB_MDNS"), "0") != 0) {
-- init_mdns_transport_discovery();
-- }
--
- if (!getenv("ADB_USB") || strcmp(getenv("ADB_USB"), "0") != 0) {
- usb_init();
- } else {
-diff --git a/adb/client/usb_libusb.cpp b/adb/client/usb_libusb.cpp
-index 53f01a0ce5..b4c3aadc28 100644
---- a/adb/client/usb_libusb.cpp
-+++ b/adb/client/usb_libusb.cpp
-@@ -30,7 +30,7 @@
- #include <thread>
- #include <unordered_map>
-
--#include <libusb/libusb.h>
-+#include <libusb-1.0/libusb.h>
-
- #include <android-base/file.h>
- #include <android-base/logging.h>
-diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
-index 2fe3b1a9e0..a61b221ce3 100644
---- a/fastboot/fastboot.cpp
-+++ b/fastboot/fastboot.cpp
-@@ -59,10 +59,8 @@
- #include <android-base/stringprintf.h>
- #include <android-base/strings.h>
- #include <android-base/unique_fd.h>
--#include <build/version.h>
- #include <libavb/libavb.h>
- #include <liblp/liblp.h>
--#include <platform_tools_version.h>
- #include <sparse/sparse.h>
- #include <ziparchive/zip_archive.h>
-
-@@ -1783,7 +1781,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
- setvbuf(stdout, nullptr, _IONBF, 0);
- setvbuf(stderr, nullptr, _IONBF, 0);
- } else if (name == "version") {
-- fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str());
-+ fprintf(stdout, "fastboot version %s\n", PLATFORM_TOOLS_VERSION);
- fprintf(stdout, "Installed as %s\n", android::base::GetExecutablePath().c_str());
- return 0;
- #if !defined(_WIN32)
-diff --git a/fastboot/fs.cpp b/fastboot/fs.cpp
-index 8c0aa6bf4e..3ad5b53568 100644
---- a/fastboot/fs.cpp
-+++ b/fastboot/fs.cpp
-@@ -117,7 +117,7 @@ static int generate_ext4_image(const char* fileName, long long partSize,
- static constexpr int block_size = 4096;
- const std::string exec_dir = android::base::GetExecutableDirectory();
-
-- const std::string mke2fs_path = exec_dir + "/mke2fs";
-+ const std::string mke2fs_path = exec_dir + "/mke2fs.android";
- std::vector<const char*> mke2fs_args = {mke2fs_path.c_str(), "-t", "ext4", "-b"};
-
- std::string block_size_str = std::to_string(block_size);
-diff --git a/libcutils/include/cutils/threads.h b/libcutils/include/cutils/threads.h
-index ba4846e33b..f3fccc4895 100644
---- a/libcutils/include/cutils/threads.h
-+++ b/libcutils/include/cutils/threads.h
-@@ -33,8 +33,6 @@ extern "C" {
- // Deprecated: use android::base::GetThreadId instead, which doesn't truncate on Mac/Windows.
- //
-
--extern pid_t gettid();
--
- //
- // Deprecated: use `_Thread_local` in C or `thread_local` in C++.
- //
diff --git a/development/android-tools/generate_build.rb b/development/android-tools/generate_build.rb
deleted file mode 100644
index 2c74ee00cc..0000000000
--- a/development/android-tools/generate_build.rb
+++ /dev/null
@@ -1,466 +0,0 @@
-#!/usr/bin/ruby
-
-# Android build system is complicated and does not allow to build
-# separate parts easily.
-# This script tries to mimic Android build rules.
-
-def expand(dir, files)
- files.map { |f| File.join(dir, f) }
-end
-
-# Compiles sources to *.o files.
-# Returns array of output *.o filenames
-def compile(sources, cflags, params = {})
- outputs = []
- for s in sources
- ext = File.extname(s)
-
- case ext
- when ".c"
- cc = "cc"
- lang_flags = "-std=gnu11 $CFLAGS $CPPFLAGS"
- when ".cpp", ".cc"
- cc = "cxx"
- lang_flags = "-std=gnu++2a $CXXFLAGS $CPPFLAGS"
- else
- raise "Unknown extension #{ext}"
- end
-
- output = s + ".o"
- outputs << output
- order_deps = if params[:order_deps]
- " || " + params[:order_deps].join(" ")
- else
- ""
- end
-
- puts "build #{output}: #{cc} #{s}#{order_deps}\n cflags = #{lang_flags} #{cflags}"
- end
-
- return outputs
-end
-
-# Generate proto and compile it
-def protoc(source)
- basename = File.join(File.dirname(source), File.basename(source, ".proto"))
- cfile = basename + ".pb.cc"
- hfile = basename + ".pb.h"
- ofile = cfile + ".o"
- puts "build #{cfile} #{hfile}: protoc #{source}"
- puts "build #{ofile}: cc #{cfile}\n cflags = -std=gnu++2a $CXXFLAGS $CPPFLAGS -I."
-
- return hfile, cfile, ofile
-end
-
-# dir - directory where ninja file is located
-# lib - static library path relative to dir
-def subninja(dir, lib)
- puts "subninja #{dir}build.ninja"
- return lib.each { |l| dir + l }
-end
-
-# Links object files
-def link(output, objects, ldflags)
- puts "build #{output}: link #{objects.join(" ")}\n ldflags = #{ldflags} $LDFLAGS"
-end
-
-def genheader(input, variable, output)
- puts "build #{output}: genheader #{input}\n var = #{variable}"
-end
-
-puts "# This set of commands generated by generate_build.rb script\n\n"
-puts "CC = #{ENV["CC"] || "clang"}"
-puts "CXX = #{ENV["CXX"] || "clang++"}\n\n"
-puts "CFLAGS = #{ENV["CFLAGS"]}"
-puts "CXXFLAGS = #{ENV["CXXFLAGS"]}"
-puts "LDFLAGS = #{ENV["LDFLAGS"]}"
-puts "PLATFORM_TOOLS_VERSION = #{ENV["PLATFORM_TOOLS_VERSION"]}\n\n"
-
-puts "" "
-rule cc
- command = $CC $cflags -c $in -o $out
-
-rule cxx
- command = $CXX $cflags -c $in -o $out
-
-rule link
- command = $CXX $ldflags $LDFLAGS $in -o $out
-
-rule protoc
- command = protoc --cpp_out=. $in
-
-rule genheader
- command = (echo 'unsigned char $var[] = {' && xxd -i <$in && echo '};') > $out
-
-
-" ""
-
-adbdfiles = %w(
- adb.cpp
- adb_io.cpp
- adb_listeners.cpp
- adb_trace.cpp
- adb_utils.cpp
- fdevent/fdevent.cpp
- fdevent/fdevent_poll.cpp
- fdevent/fdevent_epoll.cpp
- shell_service_protocol.cpp
- sockets.cpp
- transport.cpp
- transport_local.cpp
- transport_usb.cpp
-)
-libadbd = compile(expand("core/adb", adbdfiles), '-DPLATFORM_TOOLS_VERSION="\"$PLATFORM_TOOLS_VERSION\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include -Icore/diagnose_usb/include')
-
-apkent_h, apkent_c, apkent_o = protoc("core/adb/fastdeploy/proto/ApkEntry.proto")
-
-deployagent_inc = "core/adb/client/deployagent.inc"
-genheader("deployagent.jar", "kDeployAgent", deployagent_inc)
-
-deployagentscript_inc = "core/adb/client/deployagentscript.inc"
-genheader("core/adb/fastdeploy/deployagent/deployagent.sh", "kDeployAgentScript", deployagentscript_inc)
-
-adbfiles = %w(
- client/adb_client.cpp
- client/adb_install.cpp
- client/auth.cpp
- client/bugreport.cpp
- client/commandline.cpp
- client/console.cpp
- client/fastdeploy.cpp
- client/fastdeploycallbacks.cpp
- client/file_sync_client.cpp
- client/line_printer.cpp
- client/main.cpp
- client/usb_dispatch.cpp
- client/usb_libusb.cpp
- client/usb_linux.cpp
- fastdeploy/deploypatchgenerator/apk_archive.cpp
- fastdeploy/deploypatchgenerator/deploy_patch_generator.cpp
- fastdeploy/deploypatchgenerator/patch_utils.cpp
- services.cpp
- socket_spec.cpp
- sysdeps/errno.cpp
- sysdeps/posix/network.cpp
- sysdeps_unix.cpp
-)
-libadb = compile(expand("core/adb", adbfiles), "-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include -Ibase/libs/androidfw/include -Inative/include", :order_deps => [apkent_h, deployagent_inc, deployagentscript_inc])
-
-androidfwfiles = %w(
- LocaleData.cpp
- ResourceTypes.cpp
- TypeWrappers.cpp
- ZipFileRO.cpp
-)
-libandroidfw = compile(expand("base/libs/androidfw", androidfwfiles), "-Icore/base/include -Ibase/libs/androidfw/include -Icore/libutils/include -Icore/liblog/include -Icore/libsystem/include -Inative/include -Icore/libcutils/include -Icore/libziparchive/include")
-
-basefiles = %w(
- chrono_utils.cpp
- errors_unix.cpp
- file.cpp
- logging.cpp
- mapped_file.cpp
- parsenetaddress.cpp
- stringprintf.cpp
- strings.cpp
- test_utils.cpp
- threads.cpp
-)
-libbase = compile(expand("core/base", basefiles), "-DADB_HOST=1 -Icore/base/include -Icore/include")
-
-logfiles = %w(
- fake_log_device.cpp
- fake_writer.cpp
- log_event_list.cpp
- log_event_write.cpp
- logger_lock.cpp
- logger_name.cpp
- logger_write.cpp
- logprint.cpp
-)
-liblog = compile(expand("core/liblog", logfiles), "-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include")
-
-cutilsfiles = %w(
- android_get_control_file.cpp
- canned_fs_config.cpp
- fs_config.cpp
- load_file.cpp
- socket_inaddr_any_server_unix.cpp
- socket_local_client_unix.cpp
- socket_local_server_unix.cpp
- socket_network_client_unix.cpp
- sockets.cpp
- sockets_unix.cpp
- threads.cpp
-)
-libcutils = compile(expand("core/libcutils", cutilsfiles), "-D_GNU_SOURCE -Icore/libcutils/include -Icore/include -Icore/base/include")
-
-diagnoseusbfiles = %w(
- diagnose_usb.cpp
-)
-libdiagnoseusb = compile(expand("core/diagnose_usb", diagnoseusbfiles), "-Icore/include -Icore/base/include -Icore/diagnose_usb/include")
-
-libcryptofiles = %w(
- android_pubkey.c
-)
-libcrypto = compile(expand("core/libcrypto_utils", libcryptofiles), "-Icore/libcrypto_utils/include -Iboringssl/include")
-
-# TODO: make subninja working
-#boringssl = subninja('boringssl/build/', ['crypto/libcrypto.a'])
-boringssl = ["boringssl/build/crypto/libcrypto.a"]
-
-fastbootfiles = %w(
- bootimg_utils.cpp
- fastboot.cpp
- fastboot_driver.cpp
- fs.cpp
- main.cpp
- socket.cpp
- tcp.cpp
- udp.cpp
- usb_linux.cpp
- util.cpp
-)
-libfastboot = compile(expand("core/fastboot", fastbootfiles), '-DPLATFORM_TOOLS_VERSION="\"$PLATFORM_TOOLS_VERSION\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Imkbootimg/include/bootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/fs_mgr/liblp/include -Icore/diagnose_usb/include -Iavb')
-
-fsmgrfiles = %w(
- liblp/images.cpp
- liblp/partition_opener.cpp
- liblp/reader.cpp
- liblp/utility.cpp
- liblp/writer.cpp
-)
-libfsmgr = compile(expand("core/fs_mgr", fsmgrfiles), "-Icore/fs_mgr/liblp/include -Icore/base/include -Iextras/ext4_utils/include -Icore/libsparse/include")
-
-sparsefiles = %w(
- backed_block.cpp
- output_file.cpp
- sparse.cpp
- sparse_crc32.cpp
- sparse_err.cpp
- sparse_read.cpp
-)
-libsparse = compile(expand("core/libsparse", sparsefiles), "-Icore/libsparse/include -Icore/base/include")
-
-f2fsfiles = %w(
-)
-f2fs = compile(expand("extras/f2fs_utils", f2fsfiles), "-DHAVE_LINUX_TYPES_H -If2fs-tools/include -Icore/liblog/include")
-
-zipfiles = %w(
- zip_archive.cc
-)
-libzip = compile(expand("core/libziparchive", zipfiles), "-Icore/base/include -Icore/include -Icore/libziparchive/include")
-
-utilfiles = %w(
- FileMap.cpp
- SharedBuffer.cpp
- String16.cpp
- String8.cpp
- VectorImpl.cpp
- Unicode.cpp
-)
-libutil = compile(expand("core/libutils", utilfiles), "-Icore/include -Icore/base/include")
-
-ext4files = %w(
- ext4_utils.cpp
- wipe.cpp
- ext4_sb.cpp
-)
-libext4 = compile(expand("extras/ext4_utils", ext4files), "-D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include -Icore/base/include")
-
-selinuxfiles = %w(
- booleans.c
- callbacks.c
- canonicalize_context.c
- check_context.c
- disable.c
- enabled.c
- freecon.c
- getenforce.c
- init.c
- label_backends_android.c
- label.c
- label_file.c
- label_support.c
- lgetfilecon.c
- load_policy.c
- lsetfilecon.c
- matchpathcon.c
- policyvers.c
- regex.c
- selinux_config.c
- setenforce.c
- setrans_client.c
- seusers.c
- sha1.c
-)
-libselinux = compile(expand("selinux/libselinux/src", selinuxfiles), "-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -DUSE_PCRE2 -DNO_PERSISTENTLY_STORED_PATTERNS -DDISABLE_SETRANS -DDISABLE_BOOL -DNO_MEDIA_BACKEND -DNO_X_BACKEND -DNO_DB_BACKEND -DPCRE2_CODE_UNIT_WIDTH=8 -Iselinux/libselinux/include -Iselinux/libsepol/include")
-
-libsepolfiles = %w(
- assertion.c
- avrule_block.c
- avtab.c
- conditional.c
- constraint.c
- context.c
- context_record.c
- debug.c
- ebitmap.c
- expand.c
- genbools.c
- genusers.c
- hashtab.c
- hierarchy.c
- kernel_to_common.c
- mls.c
- policydb.c
- policydb_convert.c
- policydb_public.c
- services.c
- sidtab.c
- symtab.c
- util.c
- write.c
-)
-libsepol = compile(expand("selinux/libsepol/src", libsepolfiles), "-Iselinux/libsepol/include -Iselinux/libsepol/src")
-
-link("fastboot", libfsmgr + libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + f2fs + libselinux + libsepol + libfastboot + libdiagnoseusb + boringssl, "-lz -lpcre2-8 -lpthread -ldl")
-
-# mke2fs.android - a ustom version of mke2fs that supports --android_sparse (FS#56955)
-libext2fsfiles = %w(
- lib/blkid/cache.c
- lib/blkid/dev.c
- lib/blkid/devname.c
- lib/blkid/devno.c
- lib/blkid/getsize.c
- lib/blkid/llseek.c
- lib/blkid/probe.c
- lib/blkid/read.c
- lib/blkid/resolve.c
- lib/blkid/save.c
- lib/blkid/tag.c
- lib/e2p/encoding.c
- lib/e2p/feature.c
- lib/e2p/hashstr.c
- lib/e2p/mntopts.c
- lib/e2p/ostype.c
- lib/e2p/parse_num.c
- lib/e2p/uuid.c
- lib/et/com_err.c
- lib/et/error_message.c
- lib/et/et_name.c
- lib/ext2fs/alloc.c
- lib/ext2fs/alloc_sb.c
- lib/ext2fs/alloc_stats.c
- lib/ext2fs/alloc_tables.c
- lib/ext2fs/atexit.c
- lib/ext2fs/badblocks.c
- lib/ext2fs/bb_inode.c
- lib/ext2fs/bitmaps.c
- lib/ext2fs/bitops.c
- lib/ext2fs/blkmap64_ba.c
- lib/ext2fs/blkmap64_rb.c
- lib/ext2fs/blknum.c
- lib/ext2fs/block.c
- lib/ext2fs/bmap.c
- lib/ext2fs/closefs.c
- lib/ext2fs/crc16.c
- lib/ext2fs/crc32c.c
- lib/ext2fs/csum.c
- lib/ext2fs/dirblock.c
- lib/ext2fs/dir_iterate.c
- lib/ext2fs/expanddir.c
- lib/ext2fs/ext2_err.c
- lib/ext2fs/ext_attr.c
- lib/ext2fs/extent.c
- lib/ext2fs/fallocate.c
- lib/ext2fs/fileio.c
- lib/ext2fs/freefs.c
- lib/ext2fs/gen_bitmap64.c
- lib/ext2fs/gen_bitmap.c
- lib/ext2fs/get_num_dirs.c
- lib/ext2fs/getsectsize.c
- lib/ext2fs/getsize.c
- lib/ext2fs/hashmap.c
- lib/ext2fs/i_block.c
- lib/ext2fs/ind_block.c
- lib/ext2fs/initialize.c
- lib/ext2fs/inline.c
- lib/ext2fs/inline_data.c
- lib/ext2fs/inode.c
- lib/ext2fs/io_manager.c
- lib/ext2fs/ismounted.c
- lib/ext2fs/link.c
- lib/ext2fs/llseek.c
- lib/ext2fs/lookup.c
- lib/ext2fs/mkdir.c
- lib/ext2fs/mkjournal.c
- lib/ext2fs/mmp.c
- lib/ext2fs/namei.c
- lib/ext2fs/newdir.c
- lib/ext2fs/nls_utf8.c
- lib/ext2fs/openfs.c
- lib/ext2fs/progress.c
- lib/ext2fs/punch.c
- lib/ext2fs/rbtree.c
- lib/ext2fs/read_bb.c
- lib/ext2fs/read_bb_file.c
- lib/ext2fs/res_gdt.c
- lib/ext2fs/rw_bitmaps.c
- lib/ext2fs/sha512.c
- lib/ext2fs/sparse_io.c
- lib/ext2fs/symlink.c
- lib/ext2fs/undo_io.c
- lib/ext2fs/unix_io.c
- lib/ext2fs/valid_blk.c
- lib/support/dict.c
- lib/support/mkquota.c
- lib/support/parse_qtype.c
- lib/support/plausible.c
- lib/support/prof_err.c
- lib/support/profile.c
- lib/support/quotaio.c
- lib/support/quotaio_tree.c
- lib/support/quotaio_v2.c
- lib/uuid/clear.c
- lib/uuid/gen_uuid.c
- lib/uuid/isnull.c
- lib/uuid/pack.c
- lib/uuid/parse.c
- lib/uuid/unpack.c
- lib/uuid/unparse.c
- misc/create_inode.c
-)
-libext2fs = compile(expand("e2fsprogs", libext2fsfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Icore/libsparse/include")
-
-mke2fsfiles = %w(
- misc/default_profile.c
- misc/mke2fs.c
- misc/mk_hugefiles.c
- misc/util.c
-)
-mke2fs = compile(expand("e2fsprogs", mke2fsfiles), "-Ie2fsprogs/lib")
-
-link("mke2fs.android", mke2fs + libext2fs + libsparse + libbase + libzip + liblog + libutil, "-lpthread -lz")
-
-e2fsdroidfiles = %w(
- contrib/android/basefs_allocator.c
- contrib/android/base_fs.c
- contrib/android/block_list.c
- contrib/android/block_range.c
- contrib/android/e2fsdroid.c
- contrib/android/fsmap.c
- contrib/android/perms.c
-)
-e2fsdroid = compile(expand("e2fsprogs", e2fsdroidfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc")
-
-link("e2fsdroid", e2fsdroid + libext2fs + libsparse + libbase + libzip + liblog + libutil + libselinux + libsepol + libcutils, "-lz -lpthread -lpcre2-8")
-
-ext2simgfiles = %w(
- contrib/android/ext2simg.c
-)
-ext2simg = compile(expand("e2fsprogs", ext2simgfiles), "-Ie2fsprogs/lib -Icore/libsparse/include")
-
-link("ext2simg", ext2simg + libext2fs + libsparse + libbase + libzip + liblog + libutil, "-lz -lpthread")
-
-link("adb", libbase + liblog + libcutils + libutil + libadbd + libadb + libdiagnoseusb + libcrypto + boringssl + libandroidfw + libzip + [apkent_o], "-lpthread -lusb-1.0 -lprotobuf-lite -lz")
diff --git a/development/apache-maven/apache-maven.SlackBuild b/development/apache-maven/apache-maven.SlackBuild
index b76acca5a2..034e245551 100644
--- a/development/apache-maven/apache-maven.SlackBuild
+++ b/development/apache-maven/apache-maven.SlackBuild
@@ -27,7 +27,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=apache-maven
-VERSION=${VERSION:-3.8.1}
+VERSION=${VERSION:-3.8.3}
ARCH=noarch
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/development/apache-maven/apache-maven.info b/development/apache-maven/apache-maven.info
index 1511e797f0..170f601f87 100644
--- a/development/apache-maven/apache-maven.info
+++ b/development/apache-maven/apache-maven.info
@@ -1,8 +1,8 @@
PRGNAM="apache-maven"
-VERSION="3.8.1"
+VERSION="3.8.3"
HOMEPAGE="https://maven.apache.org/"
-DOWNLOAD="http://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz"
-MD5SUM="90197f18ed9036a1709ff0e09558c083"
+DOWNLOAD="http://archive.apache.org/dist/maven/maven-3/3.8.3/binaries/apache-maven-3.8.3-bin.tar.gz"
+MD5SUM="d647a38af2d204cd114011b2633cff20"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="jdk"
diff --git a/development/as31/as31.SlackBuild b/development/as31/as31.SlackBuild
index 9ca387e844..94e3e6aacb 100644
--- a/development/as31/as31.SlackBuild
+++ b/development/as31/as31.SlackBuild
@@ -22,9 +22,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
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:
diff --git a/development/astyle/README b/development/astyle/README
index ca67a8daca..d806b14db0 100644
--- a/development/astyle/README
+++ b/development/astyle/README
@@ -1,8 +1,8 @@
astyle (Artistic Style code beautifier)
-Artistic Style is a code indenter, beautifier and formatter for C, C++,
-C#, and Java. It can be used from the command-line or linked into other
-programs. Complete documentation is included.
+Artistic Style is a code indenter, beautifier and formatter for C,
+C++, C#, and Java. It can be used from the command-line or linked into
+other programs. Complete documentation is included.
-The optional shared library is not installed by the package. If it is
+The optional shared library is not installed by the package. If it is
needed for another project, please contact the maintainer.
diff --git a/development/astyle/astyle.SlackBuild b/development/astyle/astyle.SlackBuild
index 3378d8ff4c..205c1b70cb 100644
--- a/development/astyle/astyle.SlackBuild
+++ b/development/astyle/astyle.SlackBuild
@@ -64,9 +64,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
diff --git a/development/atasm/atasm.SlackBuild b/development/atasm/atasm.SlackBuild
index 0539d60675..7d9f8a8d23 100644
--- a/development/atasm/atasm.SlackBuild
+++ b/development/atasm/atasm.SlackBuild
@@ -22,9 +22,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
@@ -61,11 +58,8 @@ rm -rf $SRCDIR
unzip $CWD/$ZIPFILE
cd $SRCDIR
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
DOCDIR=/usr/doc/$PRGNAM-$VERSION
diff --git a/development/bats/README b/development/bats-core/README
index effe6e8f37..effe6e8f37 100644
--- a/development/bats/README
+++ b/development/bats-core/README
diff --git a/development/bats/bats.SlackBuild b/development/bats-core/bats-core.SlackBuild
index 09b7b71b10..5fc3309565 100644
--- a/development/bats/bats.SlackBuild
+++ b/development/bats-core/bats-core.SlackBuild
@@ -1,8 +1,8 @@
#!/bin/bash
-# Slackware build script for bats
+# Slackware build script for bats-core
-# Copyright 2015 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2015-2021 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -11,32 +11,25 @@
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# 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=bats
-VERSION=${VERSION:-0.4.0}
+PRGNAM=bats-core
+VERSION=${VERSION:-1.4.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
+ARCH=noarch
# 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
@@ -50,20 +43,6 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
set -e
rm -rf $PKG
@@ -88,7 +67,7 @@ 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 LICENSE README* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE* README* $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/bats-core/bats-core.info b/development/bats-core/bats-core.info
new file mode 100644
index 0000000000..08d9ecd824
--- /dev/null
+++ b/development/bats-core/bats-core.info
@@ -0,0 +1,10 @@
+PRGNAM="bats-core"
+VERSION="1.4.1"
+HOMEPAGE="https://github.com/bats-core/bats-core/"
+DOWNLOAD="https://github.com/bats-core/bats-core/archive/v1.4.1/bats-core-1.4.1.tar.gz"
+MD5SUM="46c2e4dad1988ed4a86cf4dfc7e826bf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Heinz Wiesinger"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/development/bats-core/slack-desc b/development/bats-core/slack-desc
new file mode 100644
index 0000000000..b91243b3b3
--- /dev/null
+++ b/development/bats-core/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+bats-core: bats-core (Bash Automated Testing System)
+bats-core:
+bats-core: Bats is a TAP-compliant testing framework for Bash. It provides a
+bats-core: simple way to verify that the UNIX programs you write behave as
+bats-core: expected.
+bats-core:
+bats-core: Homepage: https://github.com/bats-core/bats-core
+bats-core:
+bats-core:
+bats-core:
+bats-core:
diff --git a/development/bats/bats.info b/development/bats/bats.info
deleted file mode 100644
index 35acdd6a36..0000000000
--- a/development/bats/bats.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="bats"
-VERSION="0.4.0"
-HOMEPAGE="https://github.com/sstephenson/bats"
-DOWNLOAD="https://github.com/sstephenson/bats/archive/v0.4.0/bats-0.4.0.tar.gz"
-MD5SUM="aeeddc0b36b8321930bf96fce6ec41ee"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@slackbuilds.org"
diff --git a/development/bats/slack-desc b/development/bats/slack-desc
deleted file mode 100644
index b8d9274400..0000000000
--- a/development/bats/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-bats: bats (Bash Automated Testing System)
-bats:
-bats: Bats is a TAP-compliant testing framework for Bash. It provides a
-bats: simple way to verify that the UNIX programs you write behave as
-bats: expected.
-bats:
-bats: Homepage: https://github.com/sstephenson/bats
-bats:
-bats:
-bats:
-bats:
diff --git a/development/beav/beav.SlackBuild b/development/beav/beav.SlackBuild
index d4561a0ca6..e1909786ec 100644
--- a/development/beav/beav.SlackBuild
+++ b/development/beav/beav.SlackBuild
@@ -38,9 +38,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
diff --git a/development/beav/beav.info b/development/beav/beav.info
index 89b2404c29..f3e72b2c6b 100644
--- a/development/beav/beav.info
+++ b/development/beav/beav.info
@@ -1,8 +1,8 @@
PRGNAM="beav"
VERSION="1.40_18"
HOMEPAGE="https://packages.debian.org/sid/beav"
-DOWNLOAD="http://http.debian.net/debian/pool/main/b/beav/beav_1.40.orig.tar.gz \
- http://http.debian.net/debian/pool/main/b/beav/beav_1.40-18.diff.gz"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/b/beav/beav_1.40.orig.tar.gz \
+ https://deb.debian.org/debian/pool/main/b/beav/beav_1.40-18.diff.gz"
MD5SUM="9c30dce1697f468682eb2aae464de175 \
63a2f7a63334abc020cd37e86d349ec1"
DOWNLOAD_x86_64=""
diff --git a/development/bed/bed.SlackBuild b/development/bed/bed.SlackBuild
index 483b011eb5..5e7839002e 100644
--- a/development/bed/bed.SlackBuild
+++ b/development/bed/bed.SlackBuild
@@ -27,9 +27,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
diff --git a/development/blassic/blassic.SlackBuild b/development/blassic/blassic.SlackBuild
index f0ef038c07..cf57aec3d9 100644
--- a/development/blassic/blassic.SlackBuild
+++ b/development/blassic/blassic.SlackBuild
@@ -32,9 +32,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
@@ -67,11 +64,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tgz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS -fpermissive" \
diff --git a/development/blassic/blassic.info b/development/blassic/blassic.info
index f7996f9114..47c8fa1a34 100644
--- a/development/blassic/blassic.info
+++ b/development/blassic/blassic.info
@@ -1,7 +1,7 @@
PRGNAM="blassic"
VERSION="0.10.3"
-HOMEPAGE="http://web.archive.org/web/20180320150223/http://blassic.net/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/blassic-0.10.3.tgz"
+HOMEPAGE="https://blassic.net/"
+DOWNLOAD="https://blassic.net/bin/blassic-0.10.3.tgz"
MD5SUM="d9188387a84d2e5dd8b2cbef1704de3d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/development/bless/bless.SlackBuild b/development/bless/bless.SlackBuild
index 325509662d..c107d460a6 100644
--- a/development/bless/bless.SlackBuild
+++ b/development/bless/bless.SlackBuild
@@ -6,6 +6,9 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210829 bkw: note: I can't test this on -current because I can't get
+# gtk-sharp to build.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=bless
@@ -23,9 +26,6 @@ PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# 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
diff --git a/development/bmake/README b/development/bmake/README
index d04cc55bcd..98f8f67353 100644
--- a/development/bmake/README
+++ b/development/bmake/README
@@ -10,5 +10,5 @@ NetBSD's make was again imported on June 6 and December 15, 2000.
In 2003 bmake switched to a date based version (first was 20030714)
which generally represents the date it was last merged with NetBSD's
-make. Since then, NetBSD's make is imported within a week of any
+make. Since then, NetBSD's make is imported within a week of any
interesting changes, so that bmake tracks it very closely.
diff --git a/development/bmake/bmake.SlackBuild b/development/bmake/bmake.SlackBuild
index f9a4bee81d..f65fe60371 100644
--- a/development/bmake/bmake.SlackBuild
+++ b/development/bmake/bmake.SlackBuild
@@ -24,6 +24,9 @@
# Now maintained by B. Watson <yalhcru@gmail.com>
+# 20210829 bkw: update for 20210803
+# - there is a 20210808 release (5 days newer) but it fails its
+# own self-tests (specifically job-output-null).
# 20201106 bkw: update for 20201010
# 20200306 bkw: update for 20200212
# 20191211 bkw: update for 20181221
@@ -37,7 +40,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=bmake
-VERSION=${VERSION:-20201010}
+VERSION=${VERSION:-20210803}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -50,9 +53,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
@@ -113,7 +113,7 @@ CXXFLAGS="$SLKCFLAGS" \
# The usual MAKEFLAGS=-j8 or such, will break the build. bmake interprets
# MAKEFLAGS differently from GNU make. Plus, the main part of the build
# (actually compiling bmake) isn't done by make, so MAKEFLAGS would have
-# no effect. Also, the build interprets TAG as selecting a test scenario.
+# no effect. Also, the build interprets TAG as selecting a test scenario.
env \
-u MAKEFLAGS \
-u TAG \
diff --git a/development/bmake/bmake.info b/development/bmake/bmake.info
index e640ec7948..c4d00f92f5 100644
--- a/development/bmake/bmake.info
+++ b/development/bmake/bmake.info
@@ -1,8 +1,8 @@
PRGNAM="bmake"
-VERSION="20201010"
-HOMEPAGE="http://www.crufty.net/help/sjg/bmake.htm"
-DOWNLOAD="http://www.crufty.net/ftp/pub/sjg/bmake-20201010.tar.gz"
-MD5SUM="37b7890e551c8e3916d4b6834afb6b53"
+VERSION="20210803"
+HOMEPAGE="https://www.crufty.net/help/sjg/bmake.htm"
+DOWNLOAD="https://www.crufty.net/ftp/pub/sjg/bmake-20210803.tar.gz"
+MD5SUM="b85be0c3119d9000939e8f40382ede8e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/bsdiff/bsdiff.SlackBuild b/development/bsdiff/bsdiff.SlackBuild
index b7cd9b6409..0a240e7d67 100644
--- a/development/bsdiff/bsdiff.SlackBuild
+++ b/development/bsdiff/bsdiff.SlackBuild
@@ -46,9 +46,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
diff --git a/development/bsdiff/bsdiff.info b/development/bsdiff/bsdiff.info
index d647cd9e44..834f0a670e 100644
--- a/development/bsdiff/bsdiff.info
+++ b/development/bsdiff/bsdiff.info
@@ -1,7 +1,7 @@
PRGNAM="bsdiff"
VERSION="4.3"
-HOMEPAGE="http://www.daemonology.net/bsdiff/"
-DOWNLOAD="http://ftp.osuosl.org/pub/gentoo/distfiles/bsdiff-4.3.tar.gz"
+HOMEPAGE="https://www.daemonology.net/bsdiff/"
+DOWNLOAD="https://ftp.osuosl.org/pub/gentoo/distfiles/bsdiff-4.3.tar.gz"
MD5SUM="e6d812394f0e0ecc8d5df255aa1db22a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/development/bviplus/bviplus.SlackBuild b/development/bviplus/bviplus.SlackBuild
index 29f54e1e7a..0889c387c0 100644
--- a/development/bviplus/bviplus.SlackBuild
+++ b/development/bviplus/bviplus.SlackBuild
@@ -22,9 +22,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
diff --git a/development/byacc/byacc.SlackBuild b/development/byacc/byacc.SlackBuild
index 33ec729e3d..1a6d414711 100644
--- a/development/byacc/byacc.SlackBuild
+++ b/development/byacc/byacc.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=byacc
-VERSION=${VERSION:-20210619}
+VERSION=${VERSION:-20210808}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/byacc/byacc.info b/development/byacc/byacc.info
index be14598bb1..e61636bd62 100644
--- a/development/byacc/byacc.info
+++ b/development/byacc/byacc.info
@@ -1,8 +1,8 @@
PRGNAM="byacc"
-VERSION="20210619"
+VERSION="20210808"
HOMEPAGE="https://invisible-island.net/byacc/"
DOWNLOAD="https://invisible-island.net/datafiles/release/byacc.tar.gz"
-MD5SUM="ad027e9a1a78666e3e27924ce6854f97"
+MD5SUM="c66b26a5dbce291e5c3c531e8d692834"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/cc65/cc65.SlackBuild b/development/cc65/cc65.SlackBuild
index fdc77f0cf0..81ad4ccd29 100644
--- a/development/cc65/cc65.SlackBuild
+++ b/development/cc65/cc65.SlackBuild
@@ -58,9 +58,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
diff --git a/development/codespell/codespell.SlackBuild b/development/codespell/codespell.SlackBuild
index dc5a030638..5070146e11 100644
--- a/development/codespell/codespell.SlackBuild
+++ b/development/codespell/codespell.SlackBuild
@@ -6,10 +6,16 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210829 bkw:
+# - update for 2.1.0.
+# - use python3 by default. add PYVER var to force building with 2,
+# but don't document it (nobody should need it).
+# - add example/ to the doc dir.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=codespell
-VERSION=${VERSION:-1.17.1}
+VERSION=${VERSION:-2.1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +28,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
@@ -60,14 +63,14 @@ 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 {} \+
-python setup.py install --root=$PKG
+python${PYVER:-3} setup.py install --root=$PKG
make $PRGNAM.1
mkdir -p $PKG/usr/man/man1
gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README* COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* COPYING example $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/codespell/codespell.info b/development/codespell/codespell.info
index 4edb51d153..c7e38485a9 100644
--- a/development/codespell/codespell.info
+++ b/development/codespell/codespell.info
@@ -1,8 +1,8 @@
PRGNAM="codespell"
-VERSION="1.17.1"
+VERSION="2.1.0"
HOMEPAGE="https://github.com/codespell-project/codespell"
-DOWNLOAD="https://github.com/codespell-project/codespell/archive/v1.17.1/codespell-1.17.1.tar.gz"
-MD5SUM="eaa42b26713c571311ba9374046cc12f"
+DOWNLOAD="https://github.com/codespell-project/codespell/archive/v2.1.0/codespell-2.1.0.tar.gz"
+MD5SUM="76e99263c6c0660b3149b59f16f8a365"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/cproto/cproto.SlackBuild b/development/cproto/cproto.SlackBuild
index 245608aecc..6b7cb055d5 100644
--- a/development/cproto/cproto.SlackBuild
+++ b/development/cproto/cproto.SlackBuild
@@ -9,7 +9,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=cproto
-VERSION=${VERSION:-4.7q}
+VERSION=${VERSION:-4.7s}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +22,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
diff --git a/development/cproto/cproto.info b/development/cproto/cproto.info
index 8e24ba846a..09c281c893 100644
--- a/development/cproto/cproto.info
+++ b/development/cproto/cproto.info
@@ -1,8 +1,8 @@
PRGNAM="cproto"
-VERSION="4.7q"
+VERSION="4.7s"
HOMEPAGE="https://invisible-island.net/cproto/"
-DOWNLOAD="ftp://ftp.invisible-island.net/cproto/cproto-4.7q.tgz"
-MD5SUM="080c9edd8f68246304831d09e740f9e9"
+DOWNLOAD="https://invisible-mirror.net/archives/cproto/cproto-4.7s.tgz"
+MD5SUM="f1c7dfb63b934dc73f1177d0d1917867"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/d-tools/d-tools.SlackBuild b/development/d-tools/d-tools.SlackBuild
index 3c58df103d..e0f3f029ba 100644
--- a/development/d-tools/d-tools.SlackBuild
+++ b/development/d-tools/d-tools.SlackBuild
@@ -25,14 +25,14 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=d-tools
-VERSION=${VERSION:-2.096.0}
+VERSION=${VERSION:-2.097.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
-DUB_VERSION=${DUB_VERSION:-1.25.0}
-DSCANNER_VERSION=${DSCANNER_VERSION:-0.11.0}
-DCD_VERSION=${DCD_VERSION:-0.13.1}
+DUB_VERSION=${DUB_VERSION:-1.26.1}
+DSCANNER_VERSION=${DSCANNER_VERSION:-0.11.1}
+DCD_VERSION=${DCD_VERSION:-0.13.6}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/development/d-tools/d-tools.info b/development/d-tools/d-tools.info
index 3dc632fad4..4976eb90df 100644
--- a/development/d-tools/d-tools.info
+++ b/development/d-tools/d-tools.info
@@ -1,14 +1,14 @@
PRGNAM="d-tools"
-VERSION="2.096.0"
+VERSION="2.097.2"
HOMEPAGE="https://dlang.org"
-DOWNLOAD="https://download.dlackware.com/hosted-sources/d-tools/dub-1.25.0.tar.gz \
- https://download.dlackware.com/hosted-sources/d-tools/tools-2.096.0.tar.gz \
- https://download.dlackware.com/hosted-sources/d-tools/D-Scanner-0.11.0.tar.xz \
- https://download.dlackware.com/hosted-sources/d-tools/DCD-0.13.1.tar.xz"
-MD5SUM="60d031ed0e2054d721e44aea33bd0ca4 \
- 00852d0d9aba131b990baeb025fbdf38 \
- 59426567074ca0505fd394b599e0879d \
- 3eebf17739f25c511c9957ade050bbe9"
+DOWNLOAD="https://download.dlackware.com/hosted-sources/d-tools/dub-1.26.1.tar.gz \
+ https://download.dlackware.com/hosted-sources/d-tools/tools-2.097.2.tar.gz \
+ https://download.dlackware.com/hosted-sources/d-tools/D-Scanner-0.11.1.tar.xz \
+ https://download.dlackware.com/hosted-sources/d-tools/DCD-0.13.6.tar.xz"
+MD5SUM="2a07b9420e1a10691360d18e1ed5f628 \
+ 12a98335f7673f0caf33759fcb057d3a \
+ b266de4cdbbbe5270aaf4ae2eee47ab2 \
+ cfd5e4d24ba81aaffc08ea68dc833443"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="dmd"
diff --git a/development/dhex/010_fix-typos.patch b/development/dhex/010_fix-typos.patch
new file mode 100644
index 0000000000..e782e6e9a8
--- /dev/null
+++ b/development/dhex/010_fix-typos.patch
@@ -0,0 +1,177 @@
+Description: fix typos and spelling errors
+Author: Gürkan Myczko <gurkan@phys.ethz.ch>
+Author: Fabio Augusto De Muzio Tobich <ftobich@gmail.com>
+Forwarded: no
+Last-Update: 2020-11-08
+
+Index: dhex/README.txt
+===================================================================
+--- dhex.orig/README.txt
++++ dhex/README.txt
+@@ -110,9 +110,9 @@ read from it, -r can be used. For exampl
+ sets the cursor to 0xaffe, and searches for the hex string "d0 0f" backwards
+ from there.
+
+-% ./dhex -oh affe -shb d00f -w occurances.log dhex
++% ./dhex -oh affe -shb d00f -w occurrences.log dhex
+
+-writes the results into a logfile called "occurances.log" and exits.
++writes the results into a logfile called "occurrences.log" and exits.
+
+ -----------------------------------------------------------------[ 5. Hexcalc ]-
+
+Index: dhex/datatypes.h
+===================================================================
+--- dhex.orig/datatypes.h
++++ dhex/datatypes.h
+@@ -101,7 +101,7 @@ typedef struct _tSearch
+ tBool forwardnotbackward;
+ char searchstring[32];
+ tInt16 searchlen;
+- tInt64 occurancesfound;
++ tInt64 occurrencesfound;
+ tInt64 lastoccurance;
+ tInt64 lastsearchlogpos;
+ } tSearch;
+Index: dhex/dhex.1
+===================================================================
+--- dhex.orig/dhex.1
++++ dhex/dhex.1
+@@ -101,7 +101,7 @@
+ .Ek
+ .Sh DESCRIPTION
+ .Nm
+-is a hex editor. It can be used to alter individual bytes in large files. Since it is a text-mode programm based on ncurses, it can run in numerous scenarios.
++is a hex editor. It can be used to alter individual bytes in large files. Since it is a text-mode program based on ncurses, it can run in numerous scenarios.
+ .
+ Its special feature is the diff mode: With it, the user has a visual tool for file comparison. This mode is invoked when
+ .Nm
+@@ -155,7 +155,7 @@ from an exotic terminal.
+ .It Fl m Ar markerfile
+ It is possible in
+ .Nm
+-to set bookmarks and store them in a markerfile for later use. With this parameter, the markerfile is being read at start time, making it unnecesarry to read them later through the gui. Their file format is described in
++to set bookmarks and store them in a markerfile for later use. With this parameter, the markerfile is being read at start time, making it unnecessary to read them later through the gui. Their file format is described in
+ .Xr dhex_markers 5 .
+ .It Fl ob od oh oo Ar offset
+ After loading a file, the cursor is set to 0, and the first page of bytes is being shown on the screen. With one of those parameters it is possible to start at any other location in the file. The cursorposition could be given as a binary number with
+@@ -179,11 +179,11 @@ or an octal one with
+ .Pp
+ This way, the first few bytes in a file can be skipped, and just the rest can be compared.
+ .It Fl r Ar searchlog
+-When searching from the command line, the offsets are being read from this searchlog. Its format is being decribed in
++When searching from the command line, the offsets are being read from this searchlog. Its format is being described in
+ .Xr dhex_searchlog 5 .
+ .It Fl r1 Ar searchlog1
+ .It Fl r2 Ar searchlog2
+-When searching in two files simultanously, the offsets can be read from two different searchlogs.
++When searching in two files simultaneously, the offsets can be read from two different searchlogs.
+ .It Fl sa sab sh shb Ar string
+ Instead of setting the cursor offset to an absolute value, it is possible to search for a specific string from the command line. If there is an additional
+ .Op Fl ob od oh oo Ar offset
+@@ -202,7 +202,7 @@ or
+ can be applied.
+ .It Fl s1a s1ab s1h s1hb Ar string1
+ .It Fl s2a s2ab s2h s2hb Ar string2
+-In the diff mode, it is possible to search for two strings in two files simultanously.
++In the diff mode, it is possible to search for two strings in two files simultaneously.
+ .It Fl v
+ Prints out the version of
+ .Nm .
+@@ -212,7 +212,7 @@ When searching from the command line, wr
+ .Pp
+ .It Fl \&w1 Ar searchlog1
+ .It Fl w2 Ar searchlog2
+-When searching in two files simultanously, write the results from both searches into those log files.
++When searching in two files simultaneously, write the results from both searches into those log files.
+ .El
+ .Sh USER INTERFACE
+ .Ss General
+@@ -235,11 +235,11 @@ If no other
+ .Op Fl o
+ or
+ .Op Fl a
+-parameter was given at start time, the cursor is being set to offset 0. It is also being shown in the hex column. Here, it can be moved with the cursor keys. When entering a hexadecimal number, the file is being edited. The file can be edited in the ascii column as well, simply by pressing the TAB key (or whichever key was substituted for it in the keyboard setup). Pressing TAB again will return the cursor to the hex column. Pressing F9 (or its substitute) will undo the last of the changes. Changes are being shown in a differnt color.
++parameter was given at start time, the cursor is being set to offset 0. It is also being shown in the hex column. Here, it can be moved with the cursor keys. When entering a hexadecimal number, the file is being edited. The file can be edited in the ascii column as well, simply by pressing the TAB key (or whichever key was substituted for it in the keyboard setup). Pressing TAB again will return the cursor to the hex column. Pressing F9 (or its substitute) will undo the last of the changes. Changes are being shown in a different color.
+ .Pp
+ Editing is not possible in the diff mode. Here, pressing the cursor keys will move both files synchronously.
+ .Ss The goto screen
+-Pressing F1 (or its substitute) will open the Goto... screen. Here, it is possible to jump to a specific address directly, without the need of scrolling there with the cursor keys. The address can be entered in the 'To' field, either absolute or relative (to leap over a specified amount of bytes). An absolute address is being chosen by pressing '=', and a relative one by pressing '+' or '-', for a positive or negative leap respectively. Regardless of the adressing mode, it has to be entered as a hexadecimal number.
++Pressing F1 (or its substitute) will open the Goto... screen. Here, it is possible to jump to a specific address directly, without the need of scrolling there with the cursor keys. The address can be entered in the 'To' field, either absolute or relative (to leap over a specified amount of bytes). An absolute address is being chosen by pressing '=', and a relative one by pressing '+' or '-', for a positive or negative leap respectively. Regardless of the addressing mode, it has to be entered as a hexadecimal number.
+ .Pp
+ It is also possible to set up to ten bookmarks in this screen: Pressing '0'...'9' will select one of them. Moving the cursor to "Set" and pressing ENTER will alter one of those book marks. The "Diff:" fields are showing the difference between the actual cursor position and the bookmark.
+ .Pp
+@@ -249,11 +249,11 @@ parameter.
+ .Xr dhex_markers 5
+ describes the format of the marker files.
+ .Ss Searching
+-Pressing F2 (or its subsitute) will open the Search... screen. Here, a short string can be entered (either in hex, or in ascii). If no logfiles are being selected, the cursor will jump to the next occurance of this search string upon selection of "Go". It can be chosen if the search is supposed to be conducted forward of backwards.
++Pressing F2 (or its substitute) will open the Search... screen. Here, a short string can be entered (either in hex, or in ascii). If no logfiles are being selected, the cursor will jump to the next occurrence of this search string upon selection of "Go". It can be chosen if the search is supposed to be conducted forward of backwards.
+ .Pp
+-To jump to the next occurance, F3 (or its substitute) has to be pressed. To jump to the previous one, F4 has to be pressed. The search itself wraps at the edges of the file, meaning that when it reaches the end, it will start from the beginning and vice versa.
++To jump to the next occurrence, F3 (or its substitute) has to be pressed. To jump to the previous one, F4 has to be pressed. The search itself wraps at the edges of the file, meaning that when it reaches the end, it will start from the beginning and vice versa.
+ .Pp
+-Searchlogs are an advanced way of searching: Writing to the searchlog does not jump the cursor from one occurance to the next. Instead, it will write the offsets of all of them into the logfile. Their format is described in
++Searchlogs are an advanced way of searching: Writing to the searchlog does not jump the cursor from one occurrence to the next. Instead, it will write the offsets of all of them into the logfile. Their format is described in
+ .Xr dhex_searchlog 5 .
+ .Pp
+ Reading from this searchlog means that the search does not cover the whole file: Only the addresses which have been provided in this file are being searched. Thus it is possible to search for specific changes. Like for example the number of lives stored in the save file of a game.
+Index: dhex/main.c
+===================================================================
+--- dhex.orig/main.c
++++ dhex/main.c
+@@ -67,7 +67,7 @@ void helpscreen(char* argv0,int exitval)
+ fprintf(stderr," -sa, -SA, -sab, -SAB [x] find the ascii string x in file (b=backwards)\n");
+ fprintf(stderr," -sh, -SH, -shb, -SHB [x] find the hex string x in file (b=backwards)\n");
+ fprintf(stderr," -r, -R [read searchlog] read the search positions from this searchlog\n");
+- fprintf(stderr," -w, -W [write searchlog] write the location of the occurances to this log\n");
++ fprintf(stderr," -w, -W [write searchlog] write the location of the occurrences to this log\n");
+ fprintf(stderr,"\n");
+ fprintf(stderr,"%s [Parameters] [Filename1] [Filename2]: Diff mode\n",argv0);
+ fprintf(stderr," -cd, -CD [x] correlate with the minimum difference\n");
+@@ -688,7 +688,7 @@ int main(int argc,char** argv)
+ cursorpos2=actcursorpos2;
+ }
+ }
+- else if (search1.occurancesfound)
++ else if (search1.occurrencesfound)
+ {
+ searchfor(&search1,buf1,&cursorpos1,(ch==KEYF3)); // f3: next
+ firstpos1=cursorpos1;
+@@ -762,8 +762,8 @@ int main(int argc,char** argv)
+ if (markers) free(markers);
+ welcomescreen(argv[0]);
+ } else {
+- if (gosearch1) fprintf(stderr,"%lli occurances found in %s\n",search1.occurancesfound,buf1->filename);
+- if (gosearch2) fprintf(stderr,"%lli occurances found in %s\n",search2.occurancesfound,buf2->filename);
++ if (gosearch1) fprintf(stderr,"%lli occurrences found in %s\n",search1.occurrencesfound,buf1->filename);
++ if (gosearch2) fprintf(stderr,"%lli occurrences found in %s\n",search2.occurrencesfound,buf2->filename);
+ }
+ return 0;
+ }
+Index: dhex/search.c
+===================================================================
+--- dhex.orig/search.c
++++ dhex/search.c
+@@ -123,7 +123,7 @@ tInt8 searchfor(tSearch* search,tBuffer*
+ else found=0;
+ if (found)
+ {
+- search->occurancesfound++;
++ search->occurrencesfound++;
+ search->lastoccurance=actcursorpos;
+ if (search->writesearchlog) fprintf(fwlog,"%016llx\n",(tUInt64)actcursorpos+buf->baseaddr); else done=1;
+ }
+Index: dhex/ui.c
+===================================================================
+--- dhex.orig/ui.c
++++ dhex/ui.c
+@@ -100,7 +100,7 @@ void searchmask(tOutput* output,tSearch*
+ {
+ drawcenterframe(output,14,60,"Found");
+ setcolor(output,COLOR_TEXT);
+- mvwprintw(output->win,offsy+13,offsx+1,"%lld occurances found",search->occurancesfound);
++ mvwprintw(output->win,offsy+13,offsx+1,"%lld occurrences found",search->occurrencesfound);
+ getkey((tKeyTab*)output->pKeyTab,1);
+ }
+ }
diff --git a/development/dhex/dhex.SlackBuild b/development/dhex/dhex.SlackBuild
index 2f555e09e3..9cc2d62dba 100644
--- a/development/dhex/dhex.SlackBuild
+++ b/development/dhex/dhex.SlackBuild
@@ -6,11 +6,13 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210829 bkw: BUILD=2, fix typos in docs/src, fix grammar in docs.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=dhex
VERSION=${VERSION:-0.69}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +24,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
@@ -60,6 +59,13 @@ 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 {} \+
+# 20210829 bkw: patch borrowed from Debian, with thanks.
+patch -p1 < $CWD/010_fix-typos.patch
+
+# 20210829 bkw: the above patch doesn't address the weird grammar
+# in the man pages (use of "being" as a noise-word). So:
+sed -i 's,\(is\|are\) *being,\1,g' $PRGNAM.1 *.5
+
sed -i -e 's,-O3,'"$SLKCFLAGS"',' -e 's,share/man,man,' Makefile
make LDFLAGS="-L/usr/lib$LIBDIRSUFFIX"
diff --git a/development/dhex/dhex.info b/development/dhex/dhex.info
index 8b51c816cb..6088159d7b 100644
--- a/development/dhex/dhex.info
+++ b/development/dhex/dhex.info
@@ -1,7 +1,7 @@
PRGNAM="dhex"
VERSION="0.69"
-HOMEPAGE="http://www.dettus.net/dhex/"
-DOWNLOAD="http://www.dettus.net/dhex/dhex_0.69.tar.gz"
+HOMEPAGE="https://www.dettus.net/dhex/"
+DOWNLOAD="https://www.dettus.net/dhex/dhex_0.69.tar.gz"
MD5SUM="64d557437fe110c19f23ed3e9bbcdd54"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/development/dis/dis.1 b/development/dis/dis.1
new file mode 100644
index 0000000000..d1d9b862af
--- /dev/null
+++ b/development/dis/dis.1
@@ -0,0 +1,192 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "DIS" 1 "2021-08-30" "0.6" "SlackBuilds.org"
+.SH NAME
+dis \- dis - statically tracing 6502 disassembler
+.\" RST source for dis(1) man page. Convert with:
+.
+.\" rst2man.py dis.rst > dis.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+dis [\fI\-options\fP] file ...
+.SH DESCRIPTION
+.sp
+dis creates XASM/MADS\-compatible assembly code from a memory dump or
+an executable. dis statically traces execution paths starting from
+code entry points to mark which memory locations contain code. All
+other memory is treated as data. dis traces through JMP, JSR and BXX
+branch instructions. It stops at RTS, RTI and illegal instructions.
+.sp
+dis automatically determines common code entry points when
+disassembling Atari XEX/SAP files and Commodore 64 PRG files.
+.sp
+The disassembly is written to standard output.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \fI\-c\fP \fBL=XXXX\fP
+Code entry point(s)
+.TP
+.B \fI\-d\fP \fBL=XXXX\fP
+Data location(s) \- Disallow tracing as code
+.TP
+.B \fI\-C\fP \fBL=XXXX\fP
+Constant value(s)
+.TP
+.B \fI\-v\fP \fBL=XXXX\fP
+Vector(s), e.g. FFFA
+.TP
+.B \fI\-A\fP \fBL=XXXX\fP
+Data address(es)
+.TP
+.B \fI\-P\fP \fBL=XXXX\fP
+Code address(es) \- Trace target as code
+.TP
+.B \fI\-o\fP \fBL=XXXX\fP
+Origin for raw files
+.TP
+.B \fI\-l\fP
+Create labels
+.TP
+.B \fI\-i\fP
+Emit illegal opcodes
+.TP
+.B \fI\-t\fP \fBTYPE\fP
+Disassemble as TYPE:
+.INDENT 7.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+xex \- Atari executable (\-x)
+sap \- Atari SAP file
+prg \- Commodore 64 executable (\-p)
+raw \- raw memory
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.TP
+.B \fI\-x\fP
+Disassemble as Atari executable (same as \fB\-t xex\fP)
+.TP
+.B \fI\-p\fP
+Disassemble as Commodore 64 executable (same as \fB\-t prg\fP)
+.TP
+.B \fI\-comment\fP
+Emit comments
+.TP
+.B \fI\-call\fP
+Emit callers
+.TP
+.B \fI\-access\fP
+Emit accessors
+.TP
+.B \fI\-extern\fP
+Emit labels for out\-of\-range addresses
+.TP
+.B \fI\-rangelabels\fP
+Emit labels for ranges instead of base+offset
+.TP
+.B \fI\-verbose\fP
+Print info to STDERR
+.TP
+.B \fI\-dump\fP
+Print options in format for \-a
+.TP
+.B \fI\-dumpequ\fP
+Print equ statements for all labels
+.TP
+.B \fI\-headers\fP
+Print opt h\- if disabled with \-noheaders
+.TP
+.B \fI\-a\fP \fBFILE\fP
+Read options from FILE. Lines are: OPTION VALUE. If \fBFILE\fP
+is not found, it will be searched for in \fB/usr/share/dis\fP instead.
+.UNINDENT
+.sp
+Addresses may include a range, e.g. table=$300+F
+.sp
+Addresses may include xex segment number, e.g. 3:1FAE
+.sp
+Addresses for \-A and \-P may be given as HIGH_LOW, e.g. 3C64_3C62
+.SH FILES
+.INDENT 0.0
+.TP
+.B \fB/usr/share/dis/*.dop\fP
+Predefined option files for various platforms, for use with \fI\-a\fP\&.
+These include:
+.INDENT 7.0
+.INDENT 3.5
+sys.dop, hardware.dop: for use with Atari 8\-bit object code.
+.sp
+6510.dop, cia.dop, sid.dop, vic.dop: for use with Commodore 64 object code.
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/dis\-0.6/LICENSE.md for license information.
+.SH AUTHORS
+.sp
+dis was written by Lyren Brown.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The full documentation for \fBdis\fP:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+/usr/doc/dis\-0.6/README.md
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+The AtariAge thread:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+http://atariage.com/forums/topic/232658\-statically\-tracing\-6502\-disassembler/
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.\" Generated by docutils manpage writer.
+.
diff --git a/development/dis/dis.SlackBuild b/development/dis/dis.SlackBuild
index 36ab63b500..6e47a1e1d2 100644
--- a/development/dis/dis.SlackBuild
+++ b/development/dis/dis.SlackBuild
@@ -10,16 +10,13 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=dis
VERSION=${VERSION:-0.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
# no compiled code here
ARCH=noarch
-# 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
@@ -44,6 +41,8 @@ cd $PRGNAM-$RELEASE
chown -R root:root .
chmod 644 *
+sed -i 's,Dissasseble,Disassemble,g' $PRGNAM README*
+
patch -p1 < $CWD/usr_share.diff # look for .dop files also in /usr/share/dis
# manual install
@@ -52,6 +51,11 @@ install -m0755 $PRGNAM $PKG/usr/bin
install -m0644 *.dop $PKG/usr/share/$PRGNAM
install -m0644 *.md $PKG/usr/doc/$PRGNAM-$VERSION
+# uh, and now manual (page) install. The man page was made from README.md
+# by the SlackBuild author.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/dis/dis.rst b/development/dis/dis.rst
new file mode 100644
index 0000000000..f98570752f
--- /dev/null
+++ b/development/dis/dis.rst
@@ -0,0 +1,154 @@
+.. RST source for dis(1) man page. Convert with:
+.. rst2man.py dis.rst > dis.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 0.6
+.. |date| date::
+
+===
+dis
+===
+
+------------------------------------------
+dis - statically tracing 6502 disassembler
+------------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+dis [*-options*] file ...
+
+DESCRIPTION
+===========
+
+dis creates XASM/MADS-compatible assembly code from a memory dump or
+an executable. dis statically traces execution paths starting from
+code entry points to mark which memory locations contain code. All
+other memory is treated as data. dis traces through JMP, JSR and BXX
+branch instructions. It stops at RTS, RTI and illegal instructions.
+
+dis automatically determines common code entry points when
+disassembling Atari XEX/SAP files and Commodore 64 PRG files.
+
+The disassembly is written to standard output.
+
+OPTIONS
+=======
+
+*-c* **L=XXXX**
+ Code entry point(s)
+
+*-d* **L=XXXX**
+ Data location(s) - Disallow tracing as code
+
+*-C* **L=XXXX**
+ Constant value(s)
+
+*-v* **L=XXXX**
+ Vector(s), e.g. FFFA
+
+*-A* **L=XXXX**
+ Data address(es)
+
+*-P* **L=XXXX**
+ Code address(es) - Trace target as code
+
+*-o* **L=XXXX**
+ Origin for raw files
+
+*-l*
+ Create labels
+
+*-i*
+ Emit illegal opcodes
+
+*-t* **TYPE**
+ Disassemble as TYPE::
+
+ xex - Atari executable (-x)
+ sap - Atari SAP file
+ prg - Commodore 64 executable (-p)
+ raw - raw memory
+
+*-x*
+ Disassemble as Atari executable (same as **-t xex**)
+
+*-p*
+ Disassemble as Commodore 64 executable (same as **-t prg**)
+
+*-comment*
+ Emit comments
+
+*-call*
+ Emit callers
+
+*-access*
+ Emit accessors
+
+*-extern*
+ Emit labels for out-of-range addresses
+
+*-rangelabels*
+ Emit labels for ranges instead of base+offset
+
+*-verbose*
+ Print info to STDERR
+
+*-dump*
+ Print options in format for -a
+
+*-dumpequ*
+ Print equ statements for all labels
+
+*-headers*
+ Print opt h- if disabled with -noheaders
+
+*-a* **FILE**
+ Read options from FILE. Lines are: OPTION VALUE. If **FILE**
+ is not found, it will be searched for in **/usr/share/dis** instead.
+
+Addresses may include a range, e.g. table=$300+F
+
+Addresses may include xex segment number, e.g. 3:1FAE
+
+Addresses for -A and -P may be given as HIGH_LOW, e.g. 3C64_3C62
+
+FILES
+=====
+
+**/usr/share/dis/\*.dop**
+ Predefined option files for various platforms, for use with *-a*.
+ These include:
+
+ sys.dop, hardware.dop: for use with Atari 8-bit object code.
+
+ 6510.dop, cia.dop, sid.dop, vic.dop: for use with Commodore 64 object code.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/dis-|version|/LICENSE.md for license information.
+
+AUTHORS
+=======
+
+dis was written by Lyren Brown.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The full documentation for **dis**::
+
+ /usr/doc/dis-0.6/README.md
+
+The AtariAge thread::
+
+ http://atariage.com/forums/topic/232658-statically-tracing-6502-disassembler/
diff --git a/development/dis6502/dis6502.SlackBuild b/development/dis6502/dis6502.SlackBuild
index 4dd038f507..849cd83ffd 100644
--- a/development/dis6502/dis6502.SlackBuild
+++ b/development/dis6502/dis6502.SlackBuild
@@ -22,9 +22,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
@@ -61,7 +58,7 @@ chmod 644 *
patch -p1 < $CWD/compilefix.diff
patch -p1 < $CWD/helpformat.diff # add missing \n to last line of usage msg
-make CFLAGS="$SLKCFLAGS"
+make CFLAGS="$SLKCFLAGS -fcommon"
mkdir -p $PKG/usr/bin $PKG/usr/man/man1
install -s -m0755 $PRGNAM $PKG/usr/bin
diff --git a/development/dkms/dkms.SlackBuild b/development/dkms/dkms.SlackBuild
index a03ba73ac7..ddb08b5375 100644
--- a/development/dkms/dkms.SlackBuild
+++ b/development/dkms/dkms.SlackBuild
@@ -28,7 +28,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=dkms
-VERSION=${VERSION:-2.8.4}
+VERSION=${VERSION:-2.8.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -89,7 +89,7 @@ mv $PKG/usr/share/man $PKG/usr/man
rm -Rf $PKG/etc/kernel $PKG/usr/share
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a TODO README.md AUTHORS COPYING $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a README.md COPYING $PKG/usr/doc/$PRGNAM-$VERSION/
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/dkms/dkms.info b/development/dkms/dkms.info
index 63007f72d8..b09e91621e 100644
--- a/development/dkms/dkms.info
+++ b/development/dkms/dkms.info
@@ -1,8 +1,8 @@
PRGNAM="dkms"
-VERSION="2.8.4"
+VERSION="2.8.6"
HOMEPAGE="https://github.com/dell/dkms"
-DOWNLOAD="https://github.com/dell/dkms/archive/v2.8.4/dkms-2.8.4.tar.gz"
-MD5SUM="e34ff7b6d104f872a6af92c47c244715"
+DOWNLOAD="https://github.com/dell/dkms/archive/v2.8.6/dkms-2.8.6.tar.gz"
+MD5SUM="cff60aaacdd1e282a634284c6854b845"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/dmd/dmd.SlackBuild b/development/dmd/dmd.SlackBuild
index cdbee0b77b..7e9d810864 100644
--- a/development/dmd/dmd.SlackBuild
+++ b/development/dmd/dmd.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=dmd
-VERSION=${VERSION:-2.096.0}
+VERSION=${VERSION:-2.097.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/dmd/dmd.info b/development/dmd/dmd.info
index 17f35a5b09..00e78dda50 100644
--- a/development/dmd/dmd.info
+++ b/development/dmd/dmd.info
@@ -1,8 +1,8 @@
PRGNAM="dmd"
-VERSION="2.096.0"
+VERSION="2.097.2"
HOMEPAGE="https://dlang.org"
-DOWNLOAD="http://downloads.dlang.org/releases/2.x/2.096.0/dmd.2.096.0.linux.tar.xz"
-MD5SUM="af6687504906f358d7ec2ea824f30866"
+DOWNLOAD="http://downloads.dlang.org/releases/2.x/2.097.2/dmd.2.097.2.linux.tar.xz"
+MD5SUM="c2b485c7b24be8d1f068aac356c40522"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="%README%"
diff --git a/development/eclim/630fbcd5e6caa810f721b0f0de9478aaf78f7958.patch.gz b/development/eclim/630fbcd5e6caa810f721b0f0de9478aaf78f7958.patch.gz
deleted file mode 100644
index e759181210..0000000000
--- a/development/eclim/630fbcd5e6caa810f721b0f0de9478aaf78f7958.patch.gz
+++ /dev/null
Binary files differ
diff --git a/development/eclim/README b/development/eclim/README
deleted file mode 100644
index 86b549b422..0000000000
--- a/development/eclim/README
+++ /dev/null
@@ -1,17 +0,0 @@
-eclim - The power of Eclipse in your favourite editor.
-
-Eclim provides the ability to access Eclipse code editing features via
-the command line or a local network connection, allowing those features
-to be integrated with your favourite editor.
-
-This package builds against eclipse-java, but can also be built against
-eclipse-jee or eclipse-cpp instead. In that case, pass the eclipse home
-directory to the script:
-
-ECLIPSE_HOME=/opt/eclipse-jee ./eclim.SlackBuild
-
-or
-
-ECLIPSE_HOME=/opt/eclipse-cpp ./eclim.SlackBuild
-
-apache-ant and Sphinx are only needed at build-time, not runtime.
diff --git a/development/eclim/eclim.SlackBuild b/development/eclim/eclim.SlackBuild
deleted file mode 100644
index 9f57bcdee1..0000000000
--- a/development/eclim/eclim.SlackBuild
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for eclim
-
-# Copyright 2016-2019 Andrew Clemons, Wellington New Zealand
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# 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=eclim
-VERSION=${VERSION:-2.8.0}
-SPHINX_BOOTSTRAP_VERSION=${SPHINX_BOOTSTRAP_VERSION:-0.7.1}
-BUILD=${BUILD:-3}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- 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
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
-else
- SLKCFLAGS="-O2"
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf "$PRGNAM"_"$VERSION"
-tar xvf $CWD/"$PRGNAM"_"$VERSION".tar.gz
-cd $"$PRGNAM"_"$VERSION"
-
-zcat $CWD/630fbcd5e6caa810f721b0f0de9478aaf78f7958.patch.gz | patch -p1
-zcat $CWD/sphinx2.patch.gz | patch -p1
-
-rm -rf doc/theme
-
-(
- cd doc
- tar -xf "$CWD/sphinx-bootstrap-theme-$SPHINX_BOOTSTRAP_VERSION.tar.gz"
- mv "sphinx-bootstrap-theme-$SPHINX_BOOTSTRAP_VERSION" theme
-)
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# http://eclim.org/install.html#install-source
-(
- # build nailgun
- cd org.eclim/nailgun
-
- chmod +x configure
- sed -i 's/ -s -O3//' Makefile.in
-
- CFLAGS="$SLKCFLAGS" \
- CXXFLAGS="$SLKCFLAGS" \
- ./configure
-
- make
-
- find . -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-)
-
-chmod +x bin/sphinx
-
-# allow building with root - eek
-sed -i "s/'root'/'dummy'/g" ant/build.gant
-
-ECLIPSE_HOME=${ECLIPSE_HOME:-/opt/eclipse-java}
-ECLIPSE_HOME=${ECLIPSE_HOME%/}
-
-# thanks to the archlinux maintainer (thanks to mikezackles)
-sed -i \
- -e "s|File(getVariable('eclipse')|File('$ECLIPSE_HOME/'|g" \
- -e 's|${user.home}/\.|${vim.files}/|g' \
- -e '70,94d' \
- ant/build.gant
-
-ant build -Declipse.home=$ECLIPSE_HOME -Dvim.files=/usr/share/vim/vimfiles -Dfile.encoding=UTF-8
-
-mkdir -p $PKG/usr/share/vim/vimfiles
-mkdir -p $PKG$ECLIPSE_HOME
-
-ant docs vimdocs -Declipse.home=$ECLIPSE_HOME -Dvim.files=$PKG/usr/share/vim/vimfiles -Dfile.encoding=UTF-8
-ant deploy -Declipse.home=$PKG$ECLIPSE_HOME -Dvim.files=$PKG/usr/share/vim/vimfiles -Dfile.encoding=UTF-8
-
-# tidy up
-sed -i "s|$PKG||" \
- $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/bin/eclimd \
- $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/plugin.properties \
- $PKG/usr/share/vim/vimfiles/eclim/plugin/eclim.vim
-
-# generate tags for help files
-echo "ignored" | vim \
- -c "set rtp^=$PKG/usr/share/vim/vimfiles" \
- -c "source $PKG/usr/share/vim/vimfiles/plugin/eclim.vim" \
- -c 'silent! EclimHelp' \
- -c 'q!' -
-
-find $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/nailgun \! -name ng -mindepth 1 -print0 | xargs -0 rm -rf
-rm -rf build/doc/site/.doctrees
-
-# neovim support
-mkdir -p $PKG/usr/share/nvim/runtime/plugin
-(
- cd $PKG/usr/share/nvim/runtime
-
- ln -s ../../vim/vimfiles/eclim eclim
- ln -s ../../../vim/vimfiles/plugin/eclim.vim plugin/eclim.vim
-)
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- build/doc/site \
- $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
diff --git a/development/eclim/eclim.info b/development/eclim/eclim.info
deleted file mode 100644
index 070fda41e8..0000000000
--- a/development/eclim/eclim.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="eclim"
-VERSION="2.8.0"
-HOMEPAGE="http://eclim.org"
-DOWNLOAD="https://github.com/ervandew/eclim/releases/download/2.8.0/eclim_2.8.0.tar.gz \
- https://github.com/ryan-roemer/sphinx-bootstrap-theme/archive/v0.7.1/sphinx-bootstrap-theme-0.7.1.tar.gz"
-MD5SUM="aae873ee270d6c7b21a6ff3bec3f08ad \
- f2cd079095fd6b41b0762b98133b7752"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="apache-ant eclipse-java Sphinx"
-MAINTAINER="Andrew Clemons"
-EMAIL="andrew.clemons@gmail.com"
diff --git a/development/eclim/slack-desc b/development/eclim/slack-desc
deleted file mode 100644
index 8bc8bed87a..0000000000
--- a/development/eclim/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-eclim: eclim (The power of Eclipse in your favorite editor.)
-eclim:
-eclim: Eclim provides the ability to access Eclipse code editing features
-eclim: (code completion, searching, code validation, and many more) via the
-eclim: command line or a local network connection, allowing those features
-eclim: to be integrated with your favorite editor.
-eclim:
-eclim:
-eclim:
-eclim: http://eclim.org/
-eclim:
diff --git a/development/eclim/sphinx2.patch.gz b/development/eclim/sphinx2.patch.gz
deleted file mode 100644
index bf446a3bf4..0000000000
--- a/development/eclim/sphinx2.patch.gz
+++ /dev/null
Binary files differ
diff --git a/development/eclipse-cpp/eclipse-cpp.SlackBuild b/development/eclipse-cpp/eclipse-cpp.SlackBuild
index 8d3ac3fb7a..395d80f2f2 100644
--- a/development/eclipse-cpp/eclipse-cpp.SlackBuild
+++ b/development/eclipse-cpp/eclipse-cpp.SlackBuild
@@ -29,8 +29,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=eclipse-cpp
-VERSION=${VERSION:-4.20}
-SRCVERSION=${SRCVERSION:-2021-06-R}
+VERSION=${VERSION:-4.21}
+SRCVERSION=${SRCVERSION:-2021-09-R}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/eclipse-cpp/eclipse-cpp.desktop b/development/eclipse-cpp/eclipse-cpp.desktop
index 62b38fe572..8b2717fae9 100644
--- a/development/eclipse-cpp/eclipse-cpp.desktop
+++ b/development/eclipse-cpp/eclipse-cpp.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
-Exec=env SWT_GTK3=0 eclipse-cpp
+Exec=eclipse-cpp
Name=Eclipse C/C++
GenericName=Eclipse IDE for C/C++ Developers
Icon=eclipse-cpp
diff --git a/development/eclipse-cpp/eclipse-cpp.info b/development/eclipse-cpp/eclipse-cpp.info
index b0f5925455..0c8a9a0799 100644
--- a/development/eclipse-cpp/eclipse-cpp.info
+++ b/development/eclipse-cpp/eclipse-cpp.info
@@ -1,10 +1,10 @@
PRGNAM="eclipse-cpp"
-VERSION="4.20"
+VERSION="4.21"
HOMEPAGE="https://www.eclipse.org/cdt/"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://download.eclipse.org/technology/epp/downloads/release/2021-06/R/eclipse-cpp-2021-06-R-linux-gtk-x86_64.tar.gz"
-MD5SUM_x86_64="5c5b6cfcb6478579fc61e959f77573ad"
+DOWNLOAD_x86_64="https://download.eclipse.org/technology/epp/downloads/release/2021-09/R/eclipse-cpp-2021-09-R-linux-gtk-x86_64.tar.gz"
+MD5SUM_x86_64="0e2d12cb4c6929887432db8f77cd87b1"
REQUIRES="jdk11 webkit2gtk"
MAINTAINER="Andrew Clemons"
EMAIL="andrew.clemons@gmail.com"
diff --git a/development/eclipse-java/eclipse-java.SlackBuild b/development/eclipse-java/eclipse-java.SlackBuild
index a999a01773..4b1737ca8b 100644
--- a/development/eclipse-java/eclipse-java.SlackBuild
+++ b/development/eclipse-java/eclipse-java.SlackBuild
@@ -29,8 +29,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=eclipse-java
-VERSION=${VERSION:-4.20}
-SRCVERSION=${SRCVERSION:-2021-06-R}
+VERSION=${VERSION:-4.21}
+SRCVERSION=${SRCVERSION:-2021-09-R}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/eclipse-java/eclipse-java.info b/development/eclipse-java/eclipse-java.info
index 90abdde200..6a71eecf35 100644
--- a/development/eclipse-java/eclipse-java.info
+++ b/development/eclipse-java/eclipse-java.info
@@ -1,10 +1,10 @@
PRGNAM="eclipse-java"
-VERSION="4.20"
+VERSION="4.21"
HOMEPAGE="https://www.eclipse.org"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://download.eclipse.org/technology/epp/downloads/release/2021-06/R/eclipse-java-2021-06-R-linux-gtk-x86_64.tar.gz"
-MD5SUM_x86_64="774016ac8acce8e6288a94bed6f83d11"
+DOWNLOAD_x86_64="https://download.eclipse.org/technology/epp/downloads/release/2021-09/R/eclipse-java-2021-09-R-linux-gtk-x86_64.tar.gz"
+MD5SUM_x86_64="97a194e40197dc1c9be649cc87b53810"
REQUIRES="jdk11 webkit2gtk"
MAINTAINER="Andrew Clemons"
EMAIL="andrew.clemons@gmail.com"
diff --git a/development/eclipse-jee/eclipse-jee.SlackBuild b/development/eclipse-jee/eclipse-jee.SlackBuild
index 8f8a1d51d0..5845a2c566 100644
--- a/development/eclipse-jee/eclipse-jee.SlackBuild
+++ b/development/eclipse-jee/eclipse-jee.SlackBuild
@@ -29,8 +29,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=eclipse-jee
-VERSION=${VERSION:-4.20}
-SRCVERSION=${SRCVERSION:-2021-06-R}
+VERSION=${VERSION:-4.21}
+SRCVERSION=${SRCVERSION:-2021-09-R}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/eclipse-jee/eclipse-jee.desktop b/development/eclipse-jee/eclipse-jee.desktop
index 2c13318909..336f1f8717 100644
--- a/development/eclipse-jee/eclipse-jee.desktop
+++ b/development/eclipse-jee/eclipse-jee.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
-Exec=env SWT_GTK3=0 eclipse-jee
+Exec=eclipse-jee
Name=Eclipse Java EE
GenericName=Eclipse IDE for Java EE Developers
Icon=eclipse-jee
diff --git a/development/eclipse-jee/eclipse-jee.info b/development/eclipse-jee/eclipse-jee.info
index 23115676e9..a1fcf3a322 100644
--- a/development/eclipse-jee/eclipse-jee.info
+++ b/development/eclipse-jee/eclipse-jee.info
@@ -1,10 +1,10 @@
PRGNAM="eclipse-jee"
-VERSION="4.20"
+VERSION="4.21"
HOMEPAGE="https://www.eclipse.org/"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://download.eclipse.org/technology/epp/downloads/release/2021-06/R/eclipse-jee-2021-06-R-linux-gtk-x86_64.tar.gz"
-MD5SUM_x86_64="6284748ded7346cfcf117186443d5f8e"
+DOWNLOAD_x86_64="https://download.eclipse.org/technology/epp/downloads/release/2021-09/R/eclipse-jee-2021-09-R-linux-gtk-x86_64.tar.gz"
+MD5SUM_x86_64="576e5ee7c30187228122f7c9fc4f6ff1"
REQUIRES="jdk11 webkit2gtk"
MAINTAINER="Andrew Clemons"
EMAIL="andrew.clemons@gmail.com"
diff --git a/development/eclipse-php/eclipse-php.SlackBuild b/development/eclipse-php/eclipse-php.SlackBuild
index 7b4fde245d..b9617505bc 100644
--- a/development/eclipse-php/eclipse-php.SlackBuild
+++ b/development/eclipse-php/eclipse-php.SlackBuild
@@ -30,8 +30,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=eclipse-php
-VERSION=${VERSION:-4.20}
-SRCVERSION=${SRCVERSION:-2021-06-R}
+VERSION=${VERSION:-4.21}
+SRCVERSION=${SRCVERSION:-2021-09-R}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/eclipse-php/eclipse-php.desktop b/development/eclipse-php/eclipse-php.desktop
index 481c6a7ea7..ca52b3ce70 100644
--- a/development/eclipse-php/eclipse-php.desktop
+++ b/development/eclipse-php/eclipse-php.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
-Exec=env SWT_GTK3=0 eclipse-php
+Exec=eclipse-php
Name=Eclipse PHP
GenericName=Eclipse IDE for PHP Developers
Icon=eclipse-php
diff --git a/development/eclipse-php/eclipse-php.info b/development/eclipse-php/eclipse-php.info
index 092d87d164..77bb27308f 100644
--- a/development/eclipse-php/eclipse-php.info
+++ b/development/eclipse-php/eclipse-php.info
@@ -1,10 +1,10 @@
PRGNAM="eclipse-php"
-VERSION="4.20"
+VERSION="4.21"
HOMEPAGE="https://www.eclipse.org"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://download.eclipse.org/technology/epp/downloads/release/2021-06/R/eclipse-php-2021-06-R-linux-gtk-x86_64.tar.gz"
-MD5SUM_x86_64="40468d0f3299e34eebe5efa148bbc6fd"
+DOWNLOAD_x86_64="https://download.eclipse.org/technology/epp/downloads/release/2021-09/R/eclipse-php-2021-09-R-linux-gtk-x86_64.tar.gz"
+MD5SUM_x86_64="cbca10775ec59e5333c5b1c611b5e7ae"
REQUIRES="jdk11 webkit2gtk"
MAINTAINER="Giuseppe Di Terlizzi"
EMAIL="giuseppe.diterlizzi@gmail.com"
diff --git a/development/erlang-otp/erlang-otp.info b/development/erlang-otp/erlang-otp.info
index 86bd348978..bdaf47b2ad 100644
--- a/development/erlang-otp/erlang-otp.info
+++ b/development/erlang-otp/erlang-otp.info
@@ -1,8 +1,8 @@
PRGNAM="erlang-otp"
VERSION="23.2"
-HOMEPAGE="http://www.erlang.org"
-DOWNLOAD="http://www.erlang.org/download/otp_src_23.2.tar.gz \
- http://www.erlang.org/download/otp_doc_man_23.2.tar.gz"
+HOMEPAGE="https://www.erlang.org"
+DOWNLOAD="https://erlang.org/download/otp_src_23.2.tar.gz \
+ https://erlang.org/download/otp_doc_man_23.2.tar.gz"
MD5SUM="e315f59eb9e420a0e469c09649f4303f \
cfef029c3d4d6acf2cc04f8589002ecd"
DOWNLOAD_x86_64=""
diff --git a/development/erlang-otp/slack-desc b/development/erlang-otp/slack-desc
index 8ede9e0803..1dc83ce652 100644
--- a/development/erlang-otp/slack-desc
+++ b/development/erlang-otp/slack-desc
@@ -15,5 +15,5 @@ erlang-otp: with strict evaluation, single assignment, and dynamic typing.
erlang-otp: It was designed by Ericsson to support distributed,
erlang-otp: fault-tolerant, soft-real-time, non-stop applications.
erlang-otp:
-erlang-otp: http://www.erlang.org/
+erlang-otp: https://www.erlang.org/
erlang-otp:
diff --git a/development/ex-vi/ex-vi.SlackBuild b/development/ex-vi/ex-vi.SlackBuild
index d862dd2d2b..e79f516e27 100644
--- a/development/ex-vi/ex-vi.SlackBuild
+++ b/development/ex-vi/ex-vi.SlackBuild
@@ -6,6 +6,8 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210830 bkw: build 4, -j1 no longer needed on -current.
+
# 20160726 bkw: build 3
# parallel make (-jN where N > 1) fails on Slack 14.2, add -j1
@@ -34,7 +36,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=ex-vi
VERSION=${VERSION:-050325}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -46,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,11 +82,8 @@ rm -rf $TARNAME-$VERSION
tar xvf $CWD/$TARNAME-$VERSION.tar.bz2
cd $TARNAME-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# Don't install the binary with the sticky bit set. It doesn't do anything
# on Linux, and might set off alarm bells.
@@ -101,7 +97,7 @@ sed -i -e "/^#define/s,\\(TUBESIZE *\\).*$,\\1 $(( TUBECOLS * TUBELINES ))," \
# To avoid conflicts with Slackware's elvis and/or vim, we install to /opt and
# include a login script to set PATH and MANPATH.
-make -j1 all install \
+make all install \
RPMCFLAGS="$SLKCFLAGS" \
MANDIR=/opt/$PRGNAM/man \
PREFIX=/opt/$PRGNAM \
diff --git a/development/ex-vi/ex-vi.info b/development/ex-vi/ex-vi.info
index 54f763a0e8..34d428e220 100644
--- a/development/ex-vi/ex-vi.info
+++ b/development/ex-vi/ex-vi.info
@@ -1,7 +1,7 @@
PRGNAM="ex-vi"
VERSION="050325"
HOMEPAGE="http://ex-vi.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/ex-vi/ex-vi/050325/ex-050325.tar.bz2"
+DOWNLOAD="https://downloads.sourceforge.net/project/ex-vi/ex-vi/050325/ex-050325.tar.bz2"
MD5SUM="e668595254233e4d96811083a3e4e2f3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/development/fpc/README b/development/fpc/README
index f92e75fa8c..9fba9bf879 100644
--- a/development/fpc/README
+++ b/development/fpc/README
@@ -1,3 +1,5 @@
+fpc (free pascal compiler)
+
Free Pascal (aka FPK Pascal) is a 32 and 64 bit professional Pascal
compiler. It is available for different processors: Intel x86,
Amd64/x86_64, PowerPC, PowerPC64, Sparc, ARM. The discontinued 1.0
diff --git a/development/fpc/doinst.sh b/development/fpc/doinst.sh
index 1b1904e6f4..991be0d368 100644
--- a/development/fpc/doinst.sh
+++ b/development/fpc/doinst.sh
@@ -1,15 +1,11 @@
config() {
NEW="$1"
OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
if [ ! -r $OLD ]; then
mv $NEW $OLD
elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
rm $NEW
fi
- # Otherwise, we leave the .new copy for the admin to consider...
}
config etc/fpc.cfg.new
-
diff --git a/development/fpc/fix-IDE-data-file-location.patch b/development/fpc/fix-IDE-data-file-location.patch
new file mode 100644
index 0000000000..3ab047f40a
--- /dev/null
+++ b/development/fpc/fix-IDE-data-file-location.patch
@@ -0,0 +1,69 @@
+Description: Align fp IDE template file paths with Debian standards
+ The fp IDE looks for template files in /usr/bin where itself is installed.
+ However this is not conform with Debian stadard for file locations.
+ This patch fixes this by making the IDE looking for templates in the base
+ installation directory.
+Author: Abou Al Montacir <abou.almontacir@sfr.fr>
+Index: fpc/fpcsrc/packages/ide/fpmake.pp
+===================================================================
+--- fpc.orig/fpcsrc/packages/ide/fpmake.pp
++++ fpc/fpcsrc/packages/ide/fpmake.pp
+@@ -282,16 +282,16 @@ begin
+ T.Directory:='compiler';
+ T.Install:=false;
+
+- P.InstallFiles.Add('fp.ans','$(bininstalldir)');
+- P.InstallFiles.Add('gplprog.pt','$(bininstalldir)');
+- P.InstallFiles.Add('gplunit.pt','$(bininstalldir)');
+- P.InstallFiles.Add('program.pt','$(bininstalldir)');
+- P.InstallFiles.Add('unit.pt','$(bininstalldir)');
+- P.InstallFiles.Add('cvsco.tdf','$(bininstalldir)');
+- P.InstallFiles.Add('cvsdiff.tdf','$(bininstalldir)');
+- P.InstallFiles.Add('cvsup.tdf','$(bininstalldir)');
+- P.InstallFiles.Add('grep.tdf','$(bininstalldir)');
+- P.InstallFiles.Add('tpgrep.tdf','$(bininstalldir)');
++ P.InstallFiles.Add('fp.ans','$(baseinstalldir)/ide');
++ P.InstallFiles.Add('gplprog.pt','$(baseinstalldir)/ide');
++ P.InstallFiles.Add('gplunit.pt','$(baseinstalldir)/ide');
++ P.InstallFiles.Add('program.pt','$(baseinstalldir)/ide');
++ P.InstallFiles.Add('unit.pt','$(baseinstalldir)/ide');
++ P.InstallFiles.Add('cvsco.tdf','$(baseinstalldir)/ide');
++ P.InstallFiles.Add('cvsdiff.tdf','$(baseinstalldir)/ide');
++ P.InstallFiles.Add('cvsup.tdf','$(baseinstalldir)/ide');
++ P.InstallFiles.Add('grep.tdf','$(baseinstalldir)/ide');
++ P.InstallFiles.Add('tpgrep.tdf','$(baseinstalldir)/ide');
+ P.InstallFiles.Add('fp32.ico', [win32, win64], '$(bininstalldir)');
+
+ with P.Sources do
+Index: fpc/fpcsrc/packages/ide/fpini.pas
+===================================================================
+--- fpc.orig/fpcsrc/packages/ide/fpini.pas
++++ fpc/fpcsrc/packages/ide/fpini.pas
+@@ -178,12 +178,12 @@ begin
+ end;
+ {$endif WINDOWS}
+ {$else}
+- SystemIDEDir:=FExpand(DirOf(system.paramstr(0))+'../lib/fpc/'+version_string+'/ide/text');
++ SystemIDEDir:=FExpand(DirOf(system.paramstr(0))+'../lib/fpc/'+version_string+'/ide');
+ If Not ExistsDir(SystemIDEdir) Then
+ begin
+- SystemIDEDir:=FExpand(DirOf(system.paramstr(0))+'../lib64/fpc/'+version_string+'/ide/text');
++ SystemIDEDir:=FExpand(DirOf(system.paramstr(0))+'../lib64/fpc/'+version_string+'/ide');
+ If Not ExistsDir(SystemIDEdir) Then
+- SystemIDEDir:='/usr/lib/fpc/'+version_string+'/ide/text';
++ SystemIDEDir:='/usr/lib/fpc/'+version_string+'/ide';
+ end;
+ IDEdir:=CompleteDir(FExpand('~/.fp'));
+ If Not ExistsDir(IDEdir) Then
+Index: fpc/fpcsrc/packages/ide/fptemplt.pas
+===================================================================
+--- fpc.orig/fpcsrc/packages/ide/fptemplt.pas
++++ fpc/fpcsrc/packages/ide/fptemplt.pas
+@@ -280,6 +280,7 @@ begin
+ New(Templates, Init(10,10));
+ ScanDir('.');
+ ScanDir(IDEDir);
++ ScanDir(SystemIDEDir);
+ end;
+
+
diff --git a/development/fpc/fpc.SlackBuild b/development/fpc/fpc.SlackBuild
index e893499c9b..a15a542a78 100644
--- a/development/fpc/fpc.SlackBuild
+++ b/development/fpc/fpc.SlackBuild
@@ -2,7 +2,9 @@
# Slackware build script for Free Pascal
-# Written by Andre Barboza <bmg.andre@gmail.com>
+# Written by Andre Barboza <email removed>.
+# Modified by the SlackBuilds.org project.
+# Now maintained by B. Watson <yalhcru@gmail.com>.
# Redistribution and use of this script, with or without modification, is
# permitted provided that the following conditions are met:
@@ -20,14 +22,20 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Modified by the SlackBuilds.org project.
+
+# 20210904 bkw:
+# - take over maintenance.
+# - update for v3.2.2.
+# - install the IDE's data files to fpc base dir, not /usr/bin (ugh).
+# - include man page for instantfpc/ifpc.
+# - TODO: find out why exiting fp (the IDE) leaves the cursor blinking.
+# It's *very* annoying but not a showstopper.
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=fpc
-VERSION=${VERSION:-3.0.4}
-BINVERSION=${BINVERSION:-3.0.4}
+VERSION=${VERSION:-3.2.2}
+BINVER=${BINVER:-3.2.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -40,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
@@ -69,35 +74,50 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$BINVERSION ${PRGNAM}build-$VERSION
-mkdir $PRGNAM-$BINVERSION ${PRGNAM}build-$VERSION
-cd $TMP/$PRGNAM-$BINVERSION
-tar xvf $CWD/$PRGNAM-$BINVERSION.$ARCH-linux.tar --strip-components=1
+rm -rf $PRGNAM-$BINVER ${PRGNAM}build-$VERSION
+mkdir $PRGNAM-$BINVER ${PRGNAM}build-$VERSION
+cd $TMP/$PRGNAM-$BINVER
+tar xvf $CWD/$PRGNAM-$BINVER.$ARCH-linux.tar --strip-components=1
cd $TMP/${PRGNAM}build-$VERSION
tar xvf $CWD/${PRGNAM}build-$VERSION.tar.gz
-# Unpack binary files.
+# Unpack binary files. This is the bootstrap compiler; these binaries
+# don't get installed as part of the package.
(
- mkdir -p $TMP/$PRGNAM-$BINVERSION/binary
- cd $TMP/$PRGNAM-$BINVERSION/binary
- tar xvf $TMP/$PRGNAM-$BINVERSION/binary.$ARCH-linux.tar
+ mkdir -p $TMP/$PRGNAM-$BINVER/binary
+ cd $TMP/$PRGNAM-$BINVER/binary
+ tar xvf $TMP/$PRGNAM-$BINVER/binary.$ARCH-linux.tar
- cd $TMP/$PRGNAM-$BINVERSION
- tar xvf $TMP/$PRGNAM-$BINVERSION/binary/base.$ARCH-linux.tar.gz
- tar xvf $TMP/$PRGNAM-$BINVERSION/binary/utils.$ARCH-linux.tar.gz
+ cd $TMP/$PRGNAM-$BINVER
+ tar xvf $TMP/$PRGNAM-$BINVER/binary/base.$ARCH-linux.tar.gz
+ tar xvf $TMP/$PRGNAM-$BINVER/binary/utils.$ARCH-linux.tar.gz
- cd $TMP/$PRGNAM-$BINVERSION/bin
+ cd $TMP/$PRGNAM-$BINVER/bin
if [ "$ARCH" = "x86_64" ]; then
- ln -s ../lib/fpc/$BINVERSION/ppcx64
+ ln -s ../lib/fpc/$BINVER/ppcx64
else
- ln -s ../lib/fpc/$BINVERSION/ppc386
+ ln -s ../lib/fpc/$BINVER/ppc386
fi
)
-export PATH="$TMP/$PRGNAM-$BINVERSION/bin":$PATH
-echo $PATH
+export PATH="$TMP/$PRGNAM-$BINVER/bin":$PATH
+echo "=== PATH is $PATH"
cd $TMP/${PRGNAM}build-$VERSION/${PRGNAM}build-$VERSION
+
+# it's => its. It's one of my pet peeves; its occurrence annoys me.
+sed -i "s,\\(as\\|control\\) it's,\\1 its," install/man/man?/*.?
+
+# 20210905 bkw: patch taken from Debian with many thanks. Installs the
+# IDE's data files somewhere besides /usr/bin, and patches the IDE to
+# look for them there.
+patch -p1 < $CWD/fix-IDE-data-file-location.patch
+
+# 20210905 bkw: don't let the NOGDB=1 scare you. During the compile
+# we get this message:
+# Compiling IDE with GDB/MI debugger support, LibGDB is not needed
+# ...and it appears that the IDE does indeed have its debugging
+# support enabled.
make build NOGDB=1
make -j1 NOGDB=1 PREFIX=$PKG/usr install
@@ -116,10 +136,23 @@ mv $PKG/usr/share/doc $PKG/usr/doc
rmdir $PKG/usr/share
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20210905 bkw: fancier than the template, but quite a bit faster and less
+# resource-intensive.
+find $PKG -type f -a -perm /111 | \
+ xargs file -m /etc/file/magic/elf | \
+ grep -e "executable" -e "shared object" | grep ELF | \
+ cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null || true
+
+# we include one man page borrowed from Debian and edited for
+# grammar and accuracy.
+cat $CWD/instantfpc.1 > $PKG/usr/man/man1/instantfpc.1
+
+gzip $PKG/usr/man/man?/*.*
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+# no idea why Debian renames instantfpc => ifpc, so support both names.
+ln -s instantfpc.1.gz $PKG/usr/man/man1/ifpc.1.gz
+ln -s instantfpc $PKG/usr/bin/ifpc
# Create compiler config file.
mkdir -p $PKG/etc $PKG/usr/lib$LIBDIRSUFFIX/fpc/$VERSION/ide/text
@@ -128,10 +161,11 @@ $PKG/usr/lib$LIBDIRSUFFIX/fpc/$VERSION/samplecfg \
$PKG/etc
# Clean up the configs by removing our package directory.
-sed -i -e "s:$PKG::g" $PKG/etc/fpc.cfg
-sed -i -e "s:$PKG::g" $PKG/etc/fppkg.cfg
-sed -i -e "s:$PKG::g" $PKG/etc/fppkg/default
-sed -i -e "s:$PKG::g" $PKG/usr/lib$LIBDIRSUFFIX/fpc/$VERSION/ide/text/fp.cfg
+sed -i -e "s:$PKG::g" \
+ $PKG/etc/fpc.cfg \
+ $PKG/etc/fppkg.cfg \
+ $PKG/etc/fppkg/default \
+ $PKG/usr/lib$LIBDIRSUFFIX/fpc/$VERSION/ide/text/fp.cfg
mv $PKG/etc/fpc.cfg $PKG/etc/fpc.cfg.new
mkdir -p $PKG/install
@@ -141,10 +175,7 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
# fix permissions for program docs and demos.
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/fpc/fpc.info b/development/fpc/fpc.info
index dbe75c3245..55c85b9453 100644
--- a/development/fpc/fpc.info
+++ b/development/fpc/fpc.info
@@ -1,14 +1,14 @@
PRGNAM="fpc"
-VERSION="3.0.4"
+VERSION="3.2.2"
HOMEPAGE="https://www.freepascal.org/"
-DOWNLOAD="https://downloads.sourceforge.net/freepascal/fpc-3.0.4.i386-linux.tar \
- https://downloads.sourceforge.net/freepascal/fpcbuild-3.0.4.tar.gz"
-MD5SUM="110522e12522caecfcca3115bd65ca07 \
- 255717e8e6fab4b472f7c7d0d08d2c4f"
-DOWNLOAD_x86_64="https://downloads.sourceforge.net/freepascal/fpc-3.0.4.x86_64-linux.tar \
- https://downloads.sourceforge.net/freepascal/fpcbuild-3.0.4.tar.gz"
-MD5SUM_x86_64="32f8baf6c89cfed6422b7e2e0f18e7a3\
- 255717e8e6fab4b472f7c7d0d08d2c4f"
+DOWNLOAD="https://downloads.sourceforge.net/project/freepascal/Linux/3.2.2/fpc-3.2.2.i386-linux.tar \
+ https://downloads.sourceforge.net/project/freepascal/Source/3.2.2/fpcbuild-3.2.2.tar.gz"
+MD5SUM="18354e51309a34b0efe7702633568a1e \
+ 3681ae4a208be4f64ec65e832a9a702d"
+DOWNLOAD_x86_64="https://downloads.sourceforge.net/project/freepascal/Linux/3.2.2/fpc-3.2.2.x86_64-linux.tar \
+ https://downloads.sourceforge.net/project/freepascal/Source/3.2.2/fpcbuild-3.2.2.tar.gz"
+MD5SUM_x86_64="0186779de0c9caee073fc1394afbee56 \
+ 3681ae4a208be4f64ec65e832a9a702d"
REQUIRES=""
-MAINTAINER="Capi X."
-EMAIL="capi_x@haibane.org"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/development/fpc/instantfpc.1 b/development/fpc/instantfpc.1
new file mode 100644
index 0000000000..d82eddf644
--- /dev/null
+++ b/development/fpc/instantfpc.1
@@ -0,0 +1,82 @@
+.TH instantfpc 1 "5 Sep 2021" "Free Pascal" "Instant pascal code interpreter"
+.SH NAME
+instantfpc \- The Free Pascal Interpreter.
+
+.SH SYNOPSIS
+
+.B instantfpc
+[\fI\-h\fR] [\fI\-v\fR] [\fIcompiler options\fR] <\fIsource file\fR>
+[\fIprogram arguments\fR]
+
+.SH DESCRIPTION
+
+.B instantfpc
+is a Pascal code interpreter program. It compiles source and runs the
+generated program. It allows Pascal source code to be treated like a script,
+by placing
+.B #!/usr/bin/env instantfpc
+as the 'shebang' line at the top of the Pascal source file.
+
+To avoid recompiling source when it hasn't changed,
+.B instantfpc
+keeps a cache (see
+.B \-\-set\-cache
+option). When
+.B instantfpc
+is run,
+the source is compared with the cache. If the cached source is not valid, then source is
+copied to the cache with the shebang line commented out, and the cached source is compiled.
+If compilation fails, the \fBfpc\fR output is written to stdout and an exit code of 1
+is returned.
+
+If compilation is successful, the program is executed.
+If \fIprogram arguments\fR were given, they are passed to the compiled program
+when it is run.
+
+If the compiler options contains \fB\-B\fR, the program is always recompiled.
+
+If the environment variable
+.B INSTANTFPCOPTIONS
+is set, it is passed to the compiler as
+the first argument(s).
+
+.SH NOTE
+
+.B instantfpc
+is also installed as
+.B ifpc
+for compatibility with older versions of Free Pascal.
+
+.SH USAGE
+
+.B instantfpc
+takes the following arguments:
+.TP
+.B \-h
+Prints this help message and exit.
+.TP
+.B \-v
+Prints version and exit.
+.TP
+.B \-\-get\-cache
+Prints current cache directory and exit.
+.TP
+.B \-\-set\-cache=<path to cache>
+Set the cache to be used. Otherwise uses environment variable
+.B INSTANTFPCCACHE
+if set, or
+.B $HOME/.cache/instantfpc/
+otherwise.
+.TP
+.B \-\-compiler=<path to compiler>
+Normally \fBfpc\fR is searched in PATH and used as compiler.
+.TP
+.B \-\-skip\-run
+Do not execute the program. Useful to test if script compiles.
+.TP
+.B \-B
+Always recompile.
+
+.SH SEE ALSO
+.IP
+.BR fpc (1)
diff --git a/development/fpc/slack-desc b/development/fpc/slack-desc
index 63a715ceaa..ac50d2fc16 100644
--- a/development/fpc/slack-desc
+++ b/development/fpc/slack-desc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-fpc: fpc (Free Pascal is a Pascal compiler)
+fpc: fpc (free pascal compiler)
fpc:
fpc: Free Pascal (aka FPK Pascal) is a 32 and 64 bit professional Pascal
fpc: compiler. It is available for different processors: Intel x86,
diff --git a/development/frobtads/frobtads.SlackBuild b/development/frobtads/frobtads.SlackBuild
index 51cddce0a1..0691aa1313 100644
--- a/development/frobtads/frobtads.SlackBuild
+++ b/development/frobtads/frobtads.SlackBuild
@@ -15,7 +15,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=frobtads
-VERSION=${VERSION:-1.2.4}
+VERSION=${VERSION:-2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -28,9 +28,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
@@ -66,31 +63,29 @@ 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 {} \+
-# I thought to use --enable-t3debug, but that turns out to be for
-# debugging the tads3 compiler itself, not the tads code it's compiling.
-# Not useful to anyone but upstream... --enable-frobd might be of use
-# to someone, though it requires an external debugger (not included here).
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --enable-frobd \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make V=1
-make install-strip DESTDIR=$PKG
+# upstream hardcoded the share/doc stuff. hate.
+sed -i 's,share/doc,doc,' CMCommon.cmake
+
+# ENABLE_FROBD might be of use to someone, though it requires an
+# external debugger (not included here).
+mkdir -p build
+cd build
+ cmake \
+ -DENABLE_FROBD=ON \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -DNDEBUG" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DCMAKE_BUILD_TYPE=Release ..
+ make VERBOSE=1
+ make install/strip DESTDIR=$PKG
+cd ..
DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
mkdir -p $DOCDIR
-# don't need these in the pkg:
-rm -f doc/INSTALL doc/MacOSX
-cp -a doc/* $DOCDIR
ln -s ../../share/$PRGNAM/tads3/doc $DOCDIR/tads3_doc
+ln -s index.htm $DOCDIR/tads3_doc/index.html
cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/frobtads/frobtads.info b/development/frobtads/frobtads.info
index c9351e215f..ed761dc9ba 100644
--- a/development/frobtads/frobtads.info
+++ b/development/frobtads/frobtads.info
@@ -1,8 +1,8 @@
PRGNAM="frobtads"
-VERSION="1.2.4"
+VERSION="2.0"
HOMEPAGE="https://www.tads.org/frobtads.htm"
-DOWNLOAD="https://github.com/realnc/frobtads/releases/download/1.2.4/frobtads-1.2.4.tar.bz2"
-MD5SUM="d4a5b8863664998fb989f3fdd2f63de6"
+DOWNLOAD="https://github.com/realnc/frobtads/releases/download/v2.0/frobtads-2.0.tar.bz2"
+MD5SUM="5188944620298695508b9b41a2dba49c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/ftnchek/ftnchek.SlackBuild b/development/ftnchek/ftnchek.SlackBuild
index 179d2e0e1a..0610dc021e 100644
--- a/development/ftnchek/ftnchek.SlackBuild
+++ b/development/ftnchek/ftnchek.SlackBuild
@@ -32,9 +32,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
@@ -67,11 +64,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/development/ftnchek/ftnchek.info b/development/ftnchek/ftnchek.info
index 731d311e65..06e1607c0a 100644
--- a/development/ftnchek/ftnchek.info
+++ b/development/ftnchek/ftnchek.info
@@ -1,7 +1,7 @@
PRGNAM="ftnchek"
VERSION="3.3.1"
-HOMEPAGE="http://www.dsm.fordham.edu/~ftnchek/"
-DOWNLOAD="http://www.dsm.fordham.edu/~ftnchek/download/ftnchek-3.3.1.tar.gz"
+HOMEPAGE="https://www.dsm.fordham.edu/~ftnchek/"
+DOWNLOAD="https://www.dsm.fordham.edu/~ftnchek/download/ftnchek-3.3.1.tar.gz"
MD5SUM="e1f4ce51ea1a85e7b080ab5d23013f97"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/development/gcc5/gcc5.SlackBuild b/development/gcc5/gcc5.SlackBuild
index f8181187cb..502a79cd7c 100644
--- a/development/gcc5/gcc5.SlackBuild
+++ b/development/gcc5/gcc5.SlackBuild
@@ -150,6 +150,8 @@ LANGS=${LANGS:-'c,c++,java'}
echo "Building these compilers: $LANGS"
+set -e
+
case "$ARCH" in
arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
*) TARGET=$ARCH-slackware-linux ;;
@@ -212,6 +214,12 @@ ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1)
# Fix build with glibc 2.28, which no longer makes available header file <sys/ustat.h>
cat $CWD/patches/glibc2.28-ustat.diff | patch -p0 --verbose || exit 1
+ # Fix build with glibc 2.30
+ cat $CWD/patches/glibc2.30-ipc_perm.diff | patch -p0 --verbose || exit 1
+
+ # Recent linux kernels have romved the Cyclades driver
+ cat $CWD/patches/kernel-5.12.diff | patch -p1 --verbose || exit 1
+
# Fix perms/owners
chown -R root:root .
find . -perm 777 -exec chmod 755 {} \;
@@ -220,9 +228,9 @@ ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1)
find . -perm 664 -exec chmod 644 {} \;
mkdir -p $PKG/usr/doc/gcc-$VERSION
cp -a \
- COPYING* ChangeLog* FAQ INSTALL \
+ COPYING* ChangeLog* INSTALL \
LAST_UPDATED MAINTAINERS NEWS \
- README* *.html \
+ README* \
$PKG/usr/doc/gcc-$VERSION
# We will keep part of these, but they are really big...
@@ -428,7 +436,8 @@ ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1)
$GCC_ARCHOPTS \
--target=${TARGET} \
--build=${TARGET} \
- --host=${TARGET} || exit 1
+ --host=${TARGET} \
+ CXX='g++ -std=c++14' || exit 1
#--enable-java-awt=gtk \
#--disable-gtktest \
@@ -540,12 +549,12 @@ ln -s ../../../bin/ecj $PKG/usr/lib$LIBDIRSUFFIX/jvm/bin/javac
# Don't package libffi stuff anymore. GCC will link the internal version
# statically, and we'll need a newer one elsewhere.
find . -name "ffi*.h" | xargs rm -f
-find . -name "libffi*" | xargs rm -f
-rm -f usr/man/man3/ffi*
-rm -f usr/info/libffi*
+find . -name "libffi*" | xargs rm -fR
+rm -f usr/man/man3/ffi* || true
+rm -f usr/info/libffi* || true
# Install a proper pkgconfig file for libgcj:
-rm $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/pkgconfig/libgcj*pc
-rm $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/32/pkgconfig/libgcj*pc
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/pkgconfig/libgcj*pc
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/32/pkgconfig/libgcj*pc || true
mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
cat $CWD/libgcj-5.pc \
| sed -e "s,@LIBDIRSUFFIX@,${LIBDIRSUFFIX}," \
@@ -569,7 +578,7 @@ cat $CWD/libgcj-5.pc \
strip --strip-unneeded usr/bin/* 2> /dev/null
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+) || true
# Remove localizations overlapping with Slackware's gcc
rm -rf $PKG/usr/share/locale
diff --git a/development/gcc5/patches/glibc2.30-ipc_perm.diff b/development/gcc5/patches/glibc2.30-ipc_perm.diff
new file mode 100644
index 0000000000..d1a75dd56e
--- /dev/null
+++ b/development/gcc5/patches/glibc2.30-ipc_perm.diff
@@ -0,0 +1,12 @@
+--- libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h 2020-02-28 11:49:29.763277856 +0000
++++ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h 2020-02-28 11:49:45.092909823 +0000
+@@ -198,8 +198,7 @@
+ unsigned long long __unused1;
+ unsigned long long __unused2;
+ #else
+- unsigned short mode;
+- unsigned short __pad1;
++ unsigned int mode;
+ unsigned short __seq;
+ unsigned short __pad2;
+ #if defined(__x86_64__) && !defined(_LP64) \ No newline at end of file
diff --git a/development/gcc5/patches/kernel-5.12.diff b/development/gcc5/patches/kernel-5.12.diff
new file mode 100644
index 0000000000..fb2c7e597c
--- /dev/null
+++ b/development/gcc5/patches/kernel-5.12.diff
@@ -0,0 +1,37 @@
+(this patch has to be applied after the glibc-2.28 one)
+
+diff -Naur gcc-5.5.0.orig/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc gcc-5.5.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+--- gcc-5.5.0.orig/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2021-08-19 12:21:14.786000000 +0200
++++ gcc-5.5.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2021-08-19 12:22:30.135000000 +0200
+@@ -138,7 +138,6 @@
+ #include <sys/statvfs.h>
+ #include <sys/timex.h>
+ #include <sys/user.h>
+-#include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+ #include <linux/lp.h>
+@@ -387,7 +386,6 @@
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
+- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
+ #if EV_VERSION > (0x010000)
+ unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry);
+ #else
+@@ -754,15 +752,6 @@
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
+- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
+- unsigned IOCTL_CYGETMON = CYGETMON;
+- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;
+- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;
+- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;
+- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;
+- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;
+- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;
+ unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;
+ unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;
+ unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;
diff --git a/development/ghex/ghex.SlackBuild b/development/ghex/ghex.SlackBuild
index 316448b511..492c7eefc3 100644
--- a/development/ghex/ghex.SlackBuild
+++ b/development/ghex/ghex.SlackBuild
@@ -10,10 +10,16 @@
# no gnome dependencies (just GTK3). Previous versions (2.x) did depend
# on gnome so I never wanted to package them...
+# 20210831 bkw: update for v3.41.beta. Normally I wouldn't package
+# a beta, but the beta has the ability to copy/paste raw binary
+# data between ghex windows (of the same instance of ghex, anyway).
+# And the new upstream ghex maintainer is a friend (and also a SBo
+# contributor; hi Logan!)
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=ghex
-VERSION=${VERSION:-3.18.4}
+VERSION=${VERSION:-3.41.beta}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -26,9 +32,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
@@ -85,12 +88,11 @@ meson \
--strip \
build
-"${NINJA:=ninja}"
-DESTDIR="$PKG" $NINJA -C build install
+DESTDIR="$PKG" ${NINJA:-ninja} -C build install
PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
mkdir -p $PKGDOC
-cp -a AUTHORS COPYING* HACKING NEWS README $PKGDOC
+cp -a COPYING* HACKING NEWS README* $PKGDOC
cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
# Generate the HTML help, for those who don't want to install yelp.
diff --git a/development/ghex/ghex.info b/development/ghex/ghex.info
index c5e7793a1d..82e456ad9f 100644
--- a/development/ghex/ghex.info
+++ b/development/ghex/ghex.info
@@ -1,8 +1,8 @@
PRGNAM="ghex"
-VERSION="3.18.4"
+VERSION="3.41.beta"
HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/ghex/3.18/ghex-3.18.4.tar.xz"
-MD5SUM="7e6ed808766bc18285bdc6999bdf0f15"
+DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/ghex/3.41/ghex-3.41.beta.tar.xz"
+MD5SUM="47465a20af4b088694d3eec6dbc68a94"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/github-cli/github-cli.SlackBuild b/development/github-cli/github-cli.SlackBuild
index ce72e053cd..52312449e1 100644
--- a/development/github-cli/github-cli.SlackBuild
+++ b/development/github-cli/github-cli.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=github-cli
DEBNAM=gh
-VERSION=${VERSION:-1.13.1}
+VERSION=${VERSION:-2.0.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/github-cli/github-cli.info b/development/github-cli/github-cli.info
index 41d886d629..4710cfa18c 100644
--- a/development/github-cli/github-cli.info
+++ b/development/github-cli/github-cli.info
@@ -1,10 +1,10 @@
PRGNAM="github-cli"
-VERSION="1.13.1"
+VERSION="2.0.0"
HOMEPAGE="https://cli.github.com/"
-DOWNLOAD="https://github.com/cli/cli/releases/download/v1.13.1/gh_1.13.1_linux_386.deb"
-MD5SUM="731c1086584cb4ba4ea25c97699449b9"
-DOWNLOAD_x86_64="https://github.com/cli/cli/releases/download/v1.13.1/gh_1.13.1_linux_amd64.deb"
-MD5SUM_x86_64="b51608bb7a3734f63f7213b2d02d2b22"
+DOWNLOAD="https://github.com/cli/cli/releases/download/v2.0.0/gh_2.0.0_linux_386.deb"
+MD5SUM="71aa26a5a25c2efe46b7f2e18a877805"
+DOWNLOAD_x86_64="https://github.com/cli/cli/releases/download/v2.0.0/gh_2.0.0_linux_amd64.deb"
+MD5SUM_x86_64="10d7a74138aeceb9bf5339c831211668"
REQUIRES=""
MAINTAINER="Ebben Aries"
EMAIL="slackbuilds@dscp.org"
diff --git a/development/gnulib/gnulib.SlackBuild b/development/gnulib/gnulib.SlackBuild
index 1eb4750aad..e5b6ca2911 100644
--- a/development/gnulib/gnulib.SlackBuild
+++ b/development/gnulib/gnulib.SlackBuild
@@ -33,9 +33,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
diff --git a/development/gnulib/gnulib.info b/development/gnulib/gnulib.info
index 8d9a12c6a1..7a86aaeb6d 100644
--- a/development/gnulib/gnulib.info
+++ b/development/gnulib/gnulib.info
@@ -1,7 +1,7 @@
PRGNAM="gnulib"
VERSION="20140202"
HOMEPAGE="https://www.gnu.org/software/gnulib/"
-DOWNLOAD="http://http.debian.net/debian/pool/main/g/gnulib/gnulib_20140202+stable.orig.tar.gz"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/g/gnulib/gnulib_20140202+stable.orig.tar.gz"
MD5SUM="5fc03f07046c2349449db963602b9522"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/development/gnuradio/gnuradio.info b/development/gnuradio/gnuradio.info
index ac44d32d80..72624006dc 100644
--- a/development/gnuradio/gnuradio.info
+++ b/development/gnuradio/gnuradio.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://master.dl.sourceforge.net/project/slackbuildsdirectlinks/gnura
MD5SUM="34a81827c589823d1a0de8a45b7fd22f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="python-cheetah"
+REQUIRES="python2-cheetah"
MAINTAINER="Panagiotis Nikolaou"
EMAIL="hostmaster@slackonly.com"
diff --git a/development/gr-osmosdr/gr-osmosdr.info b/development/gr-osmosdr/gr-osmosdr.info
index f9a951e99f..5bcdd1fb7a 100644
--- a/development/gr-osmosdr/gr-osmosdr.info
+++ b/development/gr-osmosdr/gr-osmosdr.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://master.dl.sourceforge.net/project/slackbuildsdirectlinks/gr-os
MD5SUM="802f65fc6bbe975f4ddaabb7dcf9bfd8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="gnuradio python-cheetah"
+REQUIRES="gnuradio python2-cheetah"
MAINTAINER="Panagiotis Nikolaou"
EMAIL="hostmaster@slackonly.com"
diff --git a/development/gsoap/gsoap.SlackBuild b/development/gsoap/gsoap.SlackBuild
index 3aec3e9f7e..a6563854bc 100644
--- a/development/gsoap/gsoap.SlackBuild
+++ b/development/gsoap/gsoap.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for gsoap
-# Copyright 2009-2018 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2009-2021 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -11,21 +11,21 @@
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# 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=gsoap
-VERSION=${VERSION:-2.8.111}
+VERSION=${VERSION:-2.8.117}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -80,8 +80,6 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Patches from Gentoo
-# Fix Pre-ISO headers
-patch -p1 -i $CWD/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch
# Build shared libraries
patch -p1 -i $CWD/patches/gsoap-2.8.91-shared_libs.patch
@@ -101,8 +99,13 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install-strip DESTDIR=$PKG
+# Don't ship .la/.a files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.a
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a changelog.md LICENSE.txt NOTES.txt README.txt \
+cp -a changelog.md GPLv2_license.txt INSTALL.txt LICENSE.txt \
+ NOTES.txt README.txt factsheet.pdf license.pdf \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/development/gsoap/gsoap.info b/development/gsoap/gsoap.info
index 934cff5a32..89dec4b801 100644
--- a/development/gsoap/gsoap.info
+++ b/development/gsoap/gsoap.info
@@ -1,8 +1,8 @@
PRGNAM="gsoap"
-VERSION="2.8.111"
+VERSION="2.8.117"
HOMEPAGE="http://gsoap2.sourceforge.net/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/gsoap_2.8.111.zip"
-MD5SUM="dc579d96d8a331a42a845e2541aae763"
+DOWNLOAD="https://sourceforge.net/projects/gsoap2/files/gsoap_2.8.117.zip"
+MD5SUM="9c1a6c45125d6dda412e8a5a64fbf8b7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/gsoap/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch b/development/gsoap/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch
deleted file mode 100644
index 673deb17c3..0000000000
--- a/development/gsoap/patches/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gsoap-2.7/gsoap/Makefile.am 2008-01-27 15:02:36.000000000 -0600
-+++ gsoap-2.7mf/gsoap/Makefile.am 2008-01-28 10:24:26.000000000 -0600
-@@ -12,6 +12,9 @@ CLEANFILES=soapcpp2 stdsoap2_cpp.cpp std
- AM_CXXFLAGS=$(SOAPCPP2_DEBUG) -D$(platform)
- AM_CFLAGS=$(SOAPCPP2_DEBUG) -D$(platform)
-
-+# Install all soapcpp2 and wsdl2h files into /usr/share/gsoap
-+nobase_pkgdata_DATA = import/* plugin/* WS/* custom/* extras/*
-+
- ## we cannot build stdsoap2.o from 2 different sources (stdsoap2.cpp and stdsoap2.c), so we need an intermediate target:
- stdsoap2_ck.c: stdsoap2.cpp
- $(LN_S) $(srcdir)/stdsoap2.cpp stdsoap2_ck.c
diff --git a/development/guile1.8/guile1.8.SlackBuild b/development/guile1.8/guile1.8.SlackBuild
index 281793fb45..8d569b9f39 100644
--- a/development/guile1.8/guile1.8.SlackBuild
+++ b/development/guile1.8/guile1.8.SlackBuild
@@ -93,6 +93,8 @@ CFLAGS="$SLKCFLAGS" \
make -j1 LDFLAGS+="-lpthread"
make install DESTDIR=$PKG
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/development/hexcurse/hexcurse.SlackBuild b/development/hexcurse/hexcurse.SlackBuild
index 7679fddec7..ef23530cd9 100644
--- a/development/hexcurse/hexcurse.SlackBuild
+++ b/development/hexcurse/hexcurse.SlackBuild
@@ -22,9 +22,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
@@ -69,6 +66,8 @@ GITREV="${GITREV:-a7d60e8b}"
PATCH=v$VERSION-$GITREV.diff
[ -e $CWD/$PATCH ] && patch -p1 < $CWD/$PATCH
+SLKCFLAGS="$SLKCFLAGS -Wno-error -fcommon"
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/development/hexe/hexe.SlackBuild b/development/hexe/hexe.SlackBuild
index fb4d7adbbf..40e61eb47a 100644
--- a/development/hexe/hexe.SlackBuild
+++ b/development/hexe/hexe.SlackBuild
@@ -26,9 +26,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
@@ -70,7 +67,7 @@ patch -p1 < $CWD/fix-b-option.diff
# Get rid of inline warnings
sed -i 's,\<inline\>,,' $PRGNAM.h
-make CFLAGS="-Wall $SLKCFLAGS"
+make CFLAGS="-Wall $SLKCFLAGS -fcommon"
mkdir -p $PKG/usr/bin
install -s -m0755 -oroot -groot $PRGNAM $PKG/usr/bin
diff --git a/development/hexer/hexer.SlackBuild b/development/hexer/hexer.SlackBuild
index 61d18aa062..6a244a86cc 100644
--- a/development/hexer/hexer.SlackBuild
+++ b/development/hexer/hexer.SlackBuild
@@ -22,9 +22,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
diff --git a/development/hexer/hexer.info b/development/hexer/hexer.info
index 9f0e64b184..49f620733a 100644
--- a/development/hexer/hexer.info
+++ b/development/hexer/hexer.info
@@ -1,6 +1,6 @@
PRGNAM="hexer"
VERSION="1.0.6"
-HOMEPAGE="http://devel.ringlet.net/editors/hexer/"
+HOMEPAGE="https://devel.ringlet.net/editors/hexer/"
DOWNLOAD="https://devel.ringlet.net/files/editors/hexer/hexer-1.0.6.tar.xz"
MD5SUM="516d37a8f027cd556e98c4b81dfcf79a"
DOWNLOAD_x86_64=""
diff --git a/development/hexinator/hexinator.SlackBuild b/development/hexinator/hexinator.SlackBuild
index 4d271a974f..012a452a4b 100644
--- a/development/hexinator/hexinator.SlackBuild
+++ b/development/hexinator/hexinator.SlackBuild
@@ -32,9 +32,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
diff --git a/development/hopper/hopper.SlackBuild b/development/hopper/hopper.SlackBuild
index 841905a5f0..63b3c8403e 100644
--- a/development/hopper/hopper.SlackBuild
+++ b/development/hopper/hopper.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=hopper
-VERSION=${VERSION:-4.7.4}
+VERSION=${VERSION:-4.9.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/hopper/hopper.info b/development/hopper/hopper.info
index f17b0d6652..e71e5e3bd2 100644
--- a/development/hopper/hopper.info
+++ b/development/hopper/hopper.info
@@ -1,10 +1,10 @@
PRGNAM="hopper"
-VERSION="4.7.4"
+VERSION="4.9.2"
HOMEPAGE="https://www.hopperapp.com"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-4.7.4-Linux.pkg.tar.xz"
-MD5SUM_x86_64="ec2a706de8a72b7442010001a6ee8eed"
+DOWNLOAD_x86_64="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-4.9.2-Linux.pkg.tar.xz"
+MD5SUM_x86_64="fba72bc87a65fad8bfc8f8ea5d3d4440"
REQUIRES="libbsd"
MAINTAINER="pyllyukko"
EMAIL="pyllyukko AT maimed dot org"
diff --git a/development/icdiff/fix-pipe-handling-installed.patch b/development/icdiff/fix-pipe-handling-installed.patch
deleted file mode 100644
index fcc9c84dd9..0000000000
--- a/development/icdiff/fix-pipe-handling-installed.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: fix closed pipe handling
-Author: Sascha Steinbiss <satta@debian.org>
-Bug: https://github.com/jeffkaufman/icdiff/issues/156
-Forwarded: https://github.com/jeffkaufman/icdiff/pull/165
-Last-Update: 2019-09-25
---- a/icdiff
-+++ b/icdiff
-@@ -594,7 +594,22 @@
- validate_has_two_arguments(parser, args)
- if not options.cols:
- set_cols_option(options)
-- diff(options, *args)
-+ try:
-+ diff(options, *args)
-+ except KeyboardInterrupt:
-+ pass
-+ except IOError as e:
-+ if e.errno == errno.EPIPE:
-+ pass
-+ else:
-+ raise
-+
-+ # Close stderr to prevent printing errors when icdiff is piped to
-+ # something that closes before icdiff is done writing
-+ #
-+ # See: https://stackoverflow.com/questions/26692284/...
-+ # ...how-to-prevent-brokenpipeerror-when-doing-a-flush-in-python
-+ sys.stderr.close()
-
-
- def codec_print(s, options):
-@@ -755,18 +770,4 @@
-
-
- if __name__ == "__main__":
-- try:
-- start()
-- except KeyboardInterrupt:
-- pass
-- except IOError as e:
-- if e.errno == errno.EPIPE:
-- pass
-- else:
-- raise
-- # Close stderr to prevent printing errors when icdiff is piped to
-- # something that closes before icdiff is done writing
-- #
-- # See: https://stackoverflow.com/questions/26692284/
-- # how-to-prevent-brokenpipeerror-when-doing-a-flush-in-python
-- sys.stderr.close()
-+ start()
diff --git a/development/icdiff/icdiff.1 b/development/icdiff/icdiff.1
index a0d718e92d..d5bb5306e2 100644
--- a/development/icdiff/icdiff.1
+++ b/development/icdiff/icdiff.1
@@ -1,8 +1,5 @@
.\" Man page generated from reStructuredText.
.
-.TH ICDIFF 1 "2020-11-15" "1.9.5" "SlackBuilds.org"
-.SH NAME
-icdiff \- improved color diff
.
.nr rst2man-indent-level 0
.
@@ -30,6 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
+.TH "ICDIFF" 1 "2021-08-31" "2.0.4" "SlackBuilds.org"
+.SH NAME
+icdiff \- improved color diff
.\" RST source for icdiff(1) man page. Convert with:
.
.\" rst2man.py icdiff.rst > icdiff.1
@@ -49,10 +49,10 @@ git\-icdiff [\fIgit diff options\fP]
.SH OPTIONS
.INDENT 0.0
.TP
-.B \-\-version
+.B \-\-version
show program\(aqs version number and exit
.TP
-.B \-h\fP,\fB \-\-help
+.B \-h\fP,\fB \-\-help
show this help message and exit
.TP
.BI \-\-cols\fB= COLS
@@ -61,53 +61,62 @@ specify the width of the screen. Autodetection is Unix only
.BI \-\-encoding\fB= ENCODING
specify the file encoding; defaults to utf8
.TP
-.BI \-E \ MATCHER\fP,\fB \ \-\-exclude\-lines\fB= MATCHER
+.BI \-E \ MATCHER\fR,\fB \ \-\-exclude\-lines\fB= MATCHER
Do not diff lines that match this regex. Not compatible with the \(aqline\-numbers\(aq option
.TP
.BI \-\-head\fB= HEAD
consider only the first N lines of each file
.TP
-.B \-H\fP,\fB \-\-highlight
+.B \-H\fP,\fB \-\-highlight
color by changing the background color instead of the foreground color. Very fast, ugly, displays all changes
.TP
-.BI \-L \ LABELS\fP,\fB \ \-\-label\fB= LABELS
+.BI \-L \ LABELS\fR,\fB \ \-\-label\fB= LABELS
override file labels with arbitrary tags. Use twice, one for each file
.TP
-.B \-N\fP,\fB \-\-line\-numbers
+.B \-N\fP,\fB \-\-line\-numbers
generate output with line numbers. Not compatible with the \(aqexclude\-lines\(aq option.
.TP
-.B \-\-no\-bold
+.B \-\-no\-bold
use non\-bold colors; recommended for solarized
.TP
-.B \-\-no\-headers
+.B \-\-no\-headers
don\(aqt label the left and right sides with their file names
.TP
.BI \-\-output\-encoding\fB= OUTPUT_ENCODING
specify the output encoding; defaults to utf8
.TP
-.B \-r\fP,\fB \-\-recursive
+.B \-r\fP,\fB \-\-recursive
recursively compare subdirectories
.TP
-.B \-\-show\-all\-spaces
+.B \-s\fP,\fB \-\-report\-identical\-files
+report when two files are the same
+.TP
+.B \-\-show\-all\-spaces
color all non\-matching whitespace including that which is not needed for drawing the eye to changes. Slow, ugly, displays all changes
.TP
.BI \-\-tabsize\fB= TABSIZE
tab stop spacing
.TP
-.B \-u\fP,\fB \-\-patch
+.B \-t\fP,\fB \-\-truncate
+truncate long lines instead of wrapping them
+.TP
+.B \-u\fP,\fB \-\-patch
generate patch. This is always true, and only exists for compatibility
.TP
-.BI \-U \ NUM\fP,\fB \ \-\-unified\fB= NUM\fP,\fB \ \-\-numlines\fB= NUM
+.BI \-U \ NUM\fR,\fB \ \-\-unified\fB= NUM\fR,\fB \ \-\-numlines\fB= NUM
how many lines of context to print; can\(aqt be combined with \-\-whole\-file
.TP
-.B \-W\fP,\fB \-\-whole\-file
+.B \-W\fP,\fB \-\-whole\-file
show the whole file instead of just changed lines and context
.TP
-.B \-\-strip\-trailing\-cr
+.B \-\-strip\-trailing\-cr
strip any trailing carriage return at the end of an input line
.TP
.BI \-\-color\-map\fB= COLOR_MAP
choose which colors are used for which items. Default is \-\-color\-map=\(aqadd:green_bold,change:yellow_bold,description:blue,meta:magenta,separator:blue,subtract:red_bold\(aq. You don\(aqt have to override all of them: \(aq\-\-color\-map=separator:white,description:cyan\(aq
+.TP
+.B \-\-is\-git\-diff
+Show the real file name when displaying git\-diff result
.UNINDENT
.SH NOTE
.sp
@@ -115,10 +124,10 @@ It\(aqs highly recommended to use wide terminals with \fBicdiff\fP, for
instance 160 columns or more.
.SH EXAMPLES
.sp
-See the file /usr/doc/icdiff\-1.9.5/README.md for examples.
+See the file /usr/doc/icdiff\-2.0.4/README.md for examples.
.SH COPYRIGHT
.sp
-See the file /usr/doc/icdiff\-1.9.5/LICENSE for license information.
+See the file /usr/doc/icdiff\-2.0.4/LICENSE for license information.
.SH AUTHORS
.sp
icdiff was written by Jeff Kaufman.
diff --git a/development/icdiff/icdiff.SlackBuild b/development/icdiff/icdiff.SlackBuild
index 333f54ae4a..62bf70a0f7 100644
--- a/development/icdiff/icdiff.SlackBuild
+++ b/development/icdiff/icdiff.SlackBuild
@@ -6,10 +6,12 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210831 bkw: updated for v2.0.4.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=icdiff
-VERSION=${VERSION:-1.9.5}
+VERSION=${VERSION:-2.0.4}
SRCVER=release-$VERSION
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -23,9 +25,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
@@ -61,19 +60,7 @@ 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 {} \+
-# patch from upstream git by way of Debian: Close stderr to prevent
-# printing errors when icdiff is piped to something that closes before
-# icdiff is done writing.
-patch -p1 < $CWD/fix-pipe-handling-installed.patch
-
-# 20201115 bkw: at some point, Slackware's /usr/bin/python will be python3.
-# This stuff can go away then.
-case "${PYVER:-auto}" in
- 2|3) ;; # use as-is
- auto) PYVER=2; python3 -c 'import sys' 2>/dev/null && PYVER=3 ;;
-esac
-
-python$PYVER setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
# man page made from README.md by SlackBuild author.
mkdir -p $PKG/usr/man/man1
@@ -81,7 +68,7 @@ gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
ln -s $PRGNAM.1.gz $PKG/usr/man/man1/git-$PRGNAM.1.gz
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README* LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* LICENSE* ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/icdiff/icdiff.info b/development/icdiff/icdiff.info
index 39d246098e..784ff905ef 100644
--- a/development/icdiff/icdiff.info
+++ b/development/icdiff/icdiff.info
@@ -1,8 +1,8 @@
PRGNAM="icdiff"
-VERSION="1.9.5"
+VERSION="2.0.4"
HOMEPAGE="https://www.jefftk.com/icdiff"
-DOWNLOAD="https://github.com/jeffkaufman/icdiff/archive/release-1.9.5/icdiff-release-1.9.5.tar.gz"
-MD5SUM="c896202f930336dfa461a0295019f887"
+DOWNLOAD="https://github.com/jeffkaufman/icdiff/archive/release-2.0.4/icdiff-release-2.0.4.tar.gz"
+MD5SUM="df7987904ad39019f63454590840769e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/icdiff/icdiff.rst b/development/icdiff/icdiff.rst
index d6b9cdca42..2fc7167f99 100644
--- a/development/icdiff/icdiff.rst
+++ b/development/icdiff/icdiff.rst
@@ -2,7 +2,7 @@
.. rst2man.py icdiff.rst > icdiff.1
.. rst2man.py comes from the SBo development/docutils package.
-.. |version| replace:: 1.9.5
+.. |version| replace:: 2.0.4
.. |date| date::
======
@@ -51,8 +51,11 @@ OPTIONS
--output-encoding=OUTPUT_ENCODING
specify the output encoding; defaults to utf8
-r, --recursive recursively compare subdirectories
+-s, --report-identical-files
+ report when two files are the same
--show-all-spaces color all non-matching whitespace including that which is not needed for drawing the eye to changes. Slow, ugly, displays all changes
--tabsize=TABSIZE tab stop spacing
+-t, --truncate truncate long lines instead of wrapping them
-u, --patch generate patch. This is always true, and only exists for compatibility
-U NUM, --unified=NUM, --numlines=NUM
how many lines of context to print; can't be combined with --whole-file
@@ -60,6 +63,7 @@ OPTIONS
--strip-trailing-cr strip any trailing carriage return at the end of an input line
--color-map=COLOR_MAP
choose which colors are used for which items. Default is --color-map='add:green_bold,change:yellow_bold,description:blue,meta:magenta,separator:blue,subtract:red_bold'. You don't have to override all of them: '--color-map=separator:white,description:cyan'
+--is-git-diff Show the real file name when displaying git-diff result
NOTE
====
diff --git a/development/icemon/icemon.SlackBuild b/development/icemon/icemon.SlackBuild
index 8171050bff..014c1140b4 100644
--- a/development/icemon/icemon.SlackBuild
+++ b/development/icemon/icemon.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for icemon
-# Copyright 2010-2014 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2010-2021 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -11,21 +11,21 @@
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# 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=icemon
-VERSION=${VERSION:-7f4a841}
+VERSION=${VERSION:-3.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -79,22 +79,25 @@ 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 {} \;
-cmake \
- -DCMAKE_C_FLAGS="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_MANDIR=/usr/man
+mkdir cmake-build
+cd cmake-build
+ cmake \
+ -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \
+ -DCMAKE_C_FLAGS="${SLKCFLAGS}" \
+ -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DCMAKE_INSTALL_LIBDIR="lib${LIBDIRSUFFIX}" \
+ -DCMAKE_INSTALL_MANDIR="man" \
+ ..
-make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+ make
+ make install/strip DESTDIR=$PKG
+cd ..
find $PKG/usr/man -type f -exec gzip -9 {} \;
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md COPYING README.md \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/icemon/icemon.info b/development/icemon/icemon.info
index d737bca03f..00929c748c 100644
--- a/development/icemon/icemon.info
+++ b/development/icemon/icemon.info
@@ -1,8 +1,8 @@
PRGNAM="icemon"
-VERSION="7f4a841"
+VERSION="3.3"
HOMEPAGE="https://github.com/icecc/icemon"
-DOWNLOAD="http://www.liwjatan.at/files/src/icemon/icemon-7f4a841.tar.xz"
-MD5SUM="ad934e67f50cc7362fd5e5463aeea595"
+DOWNLOAD="https://github.com/icecc/icemon/releases/download/v3.3/icemon-3.3.tar.xz"
+MD5SUM="e7356476ca0f489057723ad9c781679b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/icemon/slack-desc b/development/icemon/slack-desc
index a465b9c870..4fcbdc25cb 100644
--- a/development/icemon/slack-desc
+++ b/development/icemon/slack-desc
@@ -1,9 +1,9 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
icemon: icemon (Monitor for icecream)
diff --git a/development/inform/destdir.diff b/development/inform/destdir.diff
new file mode 100644
index 0000000000..c85bbf9563
--- /dev/null
+++ b/development/inform/destdir.diff
@@ -0,0 +1,123 @@
+diff -Naur inform-6.35-r2/Makefile inform-6.35-r2.patched/Makefile
+--- inform-6.35-r2/Makefile 2021-06-22 00:31:25.000000000 -0400
++++ inform-6.35-r2.patched/Makefile 2021-09-01 15:38:28.641094355 -0400
+@@ -155,7 +155,7 @@
+ strip $(BINNAME)
+
+ install-compiler: $(BINNAME)
+- install -d -m $(DIRPERM) $(DESTDIR)$(BINDIR)
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(BINDIR)
+ install -c -m $(BINPERM) $(BINNAME) $(DESTDIR)$(BINDIR)
+
+ #########################################################
+@@ -172,24 +172,23 @@
+ install-stdlib-all: install-stdlib install-stdinc install-stddemos install-stdtutor
+
+ install-stdlib:
+- install -d -m $(DIRPERM) $(STDLIB)
+- install -c -m $(FILEPERM) $(wildcard ${STDSRC}/*) $(STDLIB)
+- @./fixlinks.sh $(STDLIB) $(STDLIB_LINKS)
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(STDLIB)
++ install -c -m $(FILEPERM) $(wildcard ${STDSRC}/*) $(DESTDIR)$(STDLIB)
+ @echo "** Done installing Standard Library."
+
+ install-stdinc:
+- install -d -m $(DIRPERM) $(STDINC)
+- install -c -m $(FILEPERM) $(wildcard ${STDINC_SRC}/*) $(STDINC)
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(STDINC)
++ install -c -m $(FILEPERM) $(wildcard ${STDINC_SRC}/*) $(DESTDIR)$(STDINC)
+ @echo "** Done installing Standard Library includes."
+
+ install-stddemos: stddemos
+- install -d -m $(DIRPERM) $(STDDEMO)
+- install -c -m $(FILEPERM) $(wildcard ${STDDEMOS_SRC}/*) $(STDDEMO)
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(STDDEMO)
++ install -c -m $(FILEPERM) $(wildcard ${STDDEMOS_SRC}/*) $(DESTDIR)$(STDDEMO)
+ @echo "** Done installing Standard Library demos."
+
+ install-stdtutor: stdtutor
+- install -d -m $(DIRPERM) $(STDTUTOR)
+- install -c -m $(FILEPERM) $(wildcard ${STDTUTOR_SRC}/*) $(STDTUTOR)
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(STDTUTOR)
++ install -c -m $(FILEPERM) $(wildcard ${STDTUTOR_SRC}/*) $(DESTDIR)$(STDTUTOR)
+ @echo "** Done installing Standard Library tutorials."
+
+
+@@ -206,38 +205,40 @@
+
+ install-punywrapper:
+ sed 's,^LIBPATH.*,LIBPATH=${SHAREDIR},g' $(PUNYINFORMSH) > $(PUNYINFORMSH)-scratch
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(BINDIR)
+ install -c -m $(BINPERM) $(PUNYINFORMSH)-scratch $(DESTDIR)$(BINDIR)/$(PUNYINFORMSH)
+ cd $(DESTDIR)$(BINDIR) ; ln -sf $(PUNYINFORMSH) $(PUNYINFORM)
+ rm -f $(PUNYINFORMSH)-scratch
+
+ install-punylib:
+- install -d -m $(DIRPERM) $(PUNYLIB)
+- install -c -m $(FILEPERM) $(wildcard ${PUNYLIB_SRC}/*) $(PUNYLIB)
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(PUNYLIB)
++ install -c -m $(FILEPERM) $(wildcard ${PUNYLIB_SRC}/*) $(DESTDIR)$(PUNYLIB)
+ @echo "** Done installing PunyInform Library."
+
+ install-punyhowto:
+- install -d -m $(DIRPERM) $(PUNYHOWTO)
+- install -c -m $(FILEPERM) $(wildcard ${PUNYHOWTO_SRC}/*) $(PUNYHOWTO)
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(PUNYHOWTO)
++ install -c -m $(FILEPERM) $(wildcard ${PUNYHOWTO_SRC}/*) $(DESTDIR)$(PUNYHOWTO)
+
+ install-punytests:
+- install -d -m $(DIRPERM) $(PUNYTESTS)
+- install -c -m $(FILEPERM) $(wildcard ${PUNYTESTS_SRC}/*) $(PUNYTESTS)
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(PUNYTESTS)
++ install -c -m $(FILEPERM) $(wildcard ${PUNYTESTS_SRC}/*) $(DESTDIR)$(PUNYTESTS)
+
+ install-punydocs:
+- install -d -m $(DIRPERM) $(PUNYDOCS)
+- install -d -m $(DIRPERM) $(PUNYDOCS1)
+- install -d -m $(DIRPERM) $(PUNYDOCS2)
+- install -d -m $(DIRPERM) $(PUNYDOCS3)
+- install -c -m $(FILEPERM) $(wildcard ${PUNYDOCS_SRC}/*pdf) $(PUNYDOCS)
+- install -c -m $(FILEPERM) $(wildcard ${PUNYDOCS_DIR1}/*) $(PUNYDOCS1)
+- install -c -m $(FILEPERM) $(wildcard ${PUNYDOCS_DIR2}/*) $(PUNYDOCS2)
+- install -c -m $(FILEPERM) $(wildcard ${PUNYDOCS_DIR3}/*) $(PUNYDOCS3)
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(PUNYDOCS)
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(PUNYDOCS1)
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(PUNYDOCS2)
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(PUNYDOCS3)
++ install -c -m $(FILEPERM) $(wildcard ${PUNYDOCS_SRC}/*pdf) $(DESTDIR)$(PUNYDOCS)
++ install -c -m $(FILEPERM) $(wildcard ${PUNYDOCS_DIR1}/*) $(DESTDIR)$(PUNYDOCS1)
++ install -c -m $(FILEPERM) $(wildcard ${PUNYDOCS_DIR2}/*) $(DESTDIR)$(PUNYDOCS2)
++ install -c -m $(FILEPERM) $(wildcard ${PUNYDOCS_DIR3}/*) $(DESTDIR)$(PUNYDOCS3)
+
+ install-punymisc:
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(PUNY)
+ for file in $(PUNYMISC_FILES); do \
+- install -c -m $(FILEPERM) $(PUNYSRC)/$$file $(PUNY); \
++ install -c -m $(FILEPERM) $(PUNYSRC)/$$file $(DESTDIR)$(PUNY); \
+ done
+- install -c -m $(FILEPERM) $(wildcard ${PUNYSRC}/*.inf) $(PUNY)
++ install -c -m $(FILEPERM) $(wildcard ${PUNYSRC}/*.inf) $(DESTDIR)$(PUNY)
+
+ install-puny: install-punylib install-punywrapper install-punymisc install-punyhowto install-punytests install-punydocs
+
+@@ -246,16 +247,17 @@
+ # Installing everything else
+
+ install-manual:
+- install -d -m $(DIRPERM) $(MANDIR)
+- install -c -m $(FILEPERM) $(MANPAGE) $(MANDIR)
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(MANDIR)
++ install -c -m $(FILEPERM) $(MANPAGE) $(DESTDIR)$(MANDIR)
+
+ install-contrib:
++ mkdir -p -m $(DIRPERM) $(DESTDIR)$(BINDIR)
+ install -c -m $(BINPERM) contrib/pblorb.pl $(DESTDIR)$(BINDIR)
+ install -c -m $(BINPERM) contrib/scanblorb.pl $(DESTDIR)$(BINDIR)
+ cd $(DESTDIR)$(BINDIR) ; ln -sf pblorb.pl pblorb
+ cd $(DESTDIR)$(BINDIR) ; ln -sf scanblorb.pl scanblorb
+
+-install-strip: strip install
++install-strip: all strip install
+
+ uninstall:
+ rm -f $(DESTDIR)$(BINDIR)/$(BINNAME)
diff --git a/development/inform/inform.SlackBuild b/development/inform/inform.SlackBuild
index f7aff75bca..75a7cd7ddd 100644
--- a/development/inform/inform.SlackBuild
+++ b/development/inform/inform.SlackBuild
@@ -6,6 +6,11 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210831 bkw:
+# - updated for v6.35_r2 (upstream changed their version numbering
+# scheme again). script had to change a lot, so can't build old
+# versions any more.
+
# 20201104 bkw: updated for 6.34_6.12.4. In case anyone's wondering
# why I use a self-hosted URL for the source, it's because upstream
# moves the old source immediately when a new release is made. Also
@@ -24,7 +29,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=inform
-VERSION=${VERSION:-6.34_6.12.4_1}
+VERSION=${VERSION:-6.35_r2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -37,9 +42,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
@@ -82,19 +84,20 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
\! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# 20201104 bkw: Since inform is for game purposes, install the binary
-# to /usr/games, and its man page to section 6.
-sed '1s/"1"/"6"/' $PRGNAM.1 > $PRGNAM.6
+# to /usr/games, and its man page to section 6. Also change the
+# "see also" to a man page that actually might exist.
+sed -e '1s/"1"/"6"/' -e "s,zcode-interpreter,frotz," $PRGNAM.1 > $PRGNAM.6
-# 20201105 bkw: Minor fixes to Makefile so parallel builds work.
-patch -p1 < $CWD/parallel_make.diff
+# 20201104 bkw: upstream now supports DESTDIR again.
+# 20210831 bkw: upstream *broke* DESTDIR again. Sigh.
+patch -p1 < $CWD/destdir.diff
-# 20201104 bkw: Don't write to real $PREFIX! Just disable the CASETEST
-# stuff, since we're including our own set of symlinks.
-sed -i '/touch.*PREFIX/,+2d' Makefile
+# 20210831 bkw: install-strip failed with "text file busy" on -current,
+# use -Wl,-s to build the binary stripped in the first place.
-# 20201104 bkw: upstream now supports DESTDIR again.
-make install-strip \
+make install \
OPTS="$SLKCFLAGS" \
+ LDFLAGS="-Wl,-s" \
BINDIR=/usr/games \
MANDIR=/usr/man/man6 \
MANPAGE=$PRGNAM.6 \
@@ -116,7 +119,7 @@ ln -s ../games/$PRGNAM $PKG/usr/bin/$PRGNAM
# Makefile can create a few symlinks to support this, but let's
# be more all-inclusive. We got 8 .h files, and end up with 70+
# symlinks. There's no kill like overkill!
-( cd $PKG/usr/share/$PRGNAM/lib
+( cd $PKG/usr/share/$PRGNAM/std/lib
for file in *.h; do
name=${file%%.*}
# Name.h NAME.h
@@ -141,7 +144,9 @@ ln -s ../games/$PRGNAM $PKG/usr/bin/$PRGNAM
# This might be overcautious: the example code all just says
# e.g. 'Include "Parser"', without the .h.
for file in *.h; do
- ln -s $( readlink $file ) ${file%%.*}.H
+ dest="${file%%.*}.H"
+ [ -L "$file" ] && file="$( readlink $file )"
+ ln -s $file $dest
done
)
@@ -157,10 +162,18 @@ mkdir -p $PKGDOC/manual
# Inform Beginners' Guide, required reading.
cat $CWD/IBG.pdf > $PKGDOC/inform_beginners_guide.pdf
+ln -s inform_beginners_guide.pdf $PKGDOC/IBG.pdf
+# Library documentation should be visibile in /usr/doc.
mkdir -p $PKGDOC/lib
for i in ChangeLog README.txt voices_and_tenses.txt; do
- ln -s ../../../share/$PRGNAM/lib/$i $PKGDOC/lib
+ ln -s ../../../share/$PRGNAM/std/lib/$i $PKGDOC/lib
+done
+
+# Same for punyinform docs.
+mkdir -p $PKGDOC/punyinform
+for i in README.md LICENSE documentation; do
+ ln -s ../../../share/$PRGNAM/punyinform/$i $PKGDOC/punyinform
done
# ARTISTIC and COPYING are redundant: src/licence.txt includes the
diff --git a/development/inform/inform.info b/development/inform/inform.info
index b4130e35fc..24e53b1ec7 100644
--- a/development/inform/inform.info
+++ b/development/inform/inform.info
@@ -1,10 +1,10 @@
PRGNAM="inform"
-VERSION="6.34_6.12.4_1"
+VERSION="6.35_r2"
HOMEPAGE="http://www.inform-fiction.org/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/inform-6.34-6.12.4-1.tar.gz \
+DOWNLOAD="https://slackware.uk/~urchlay/src/inform-6.35-r2.tar.gz \
http://www.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/designers_manual_4.zip \
http://www.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/IBG.pdf"
-MD5SUM="b128a7aff7ed2b1086d020febae20746 \
+MD5SUM="9035fb1469ae9a39c077b5b55f05aebc \
0063968c3378636add1a0697b6d1fc16 \
b2635d3d61313bed286409500fc55bed"
DOWNLOAD_x86_64=""
diff --git a/development/inform/parallel_make.diff b/development/inform/parallel_make.diff
deleted file mode 100644
index f2c13267ce..0000000000
--- a/development/inform/parallel_make.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur inform-6.34-6.12.4-1/Makefile inform-6.34-6.12.4-1.patched/Makefile
---- inform-6.34-6.12.4-1/Makefile 2020-08-02 20:37:10.000000000 -0400
-+++ inform-6.34-6.12.4-1.patched/Makefile 2020-11-05 00:32:19.772575474 -0500
-@@ -67,7 +67,7 @@
- $(CC) -o $(BINNAME) $(OBJECTS)
- @echo "** Done building compiler."
-
--%.z5: %.inf
-+%.z5: %.inf $(BINNAME)
- $(PWD)/$(BINNAME) +lib $< $@
-
- demos: $(BINNAME) $(DEMO_Z5)
-@@ -115,6 +115,7 @@
- install -c -m 644 $(wildcard ${TUTOR}/*) $(DESTDIR)$(TUTORDIR)
-
- install-contrib:
-+ install -d -m 755 $(DESTDIR)$(BINDIR)
- install -c -m 755 contrib/pblorb.pl $(DESTDIR)$(BINDIR)
- install -c -m 755 contrib/scanblorb.pl $(DESTDIR)$(BINDIR)
- cd $(DESTDIR)$(BINDIR) ; ln -s pblorb.pl pblorb
diff --git a/development/jdk11/jdk11.SlackBuild b/development/jdk11/jdk11.SlackBuild
index da5061a7a8..272f86d660 100644
--- a/development/jdk11/jdk11.SlackBuild
+++ b/development/jdk11/jdk11.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=jdk11
-VERSION=${VERSION:-11.0.11}
+VERSION=${VERSION:-11.0.12}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -38,8 +38,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-set -eu
-
# 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.
@@ -48,6 +46,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
+set -eu
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
diff --git a/development/jdk11/jdk11.info b/development/jdk11/jdk11.info
index 0689b06027..61610c0225 100644
--- a/development/jdk11/jdk11.info
+++ b/development/jdk11/jdk11.info
@@ -1,10 +1,10 @@
PRGNAM="jdk11"
-VERSION="11.0.11"
+VERSION="11.0.12"
HOMEPAGE="https://developer.oracle.com/java"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://download.oracle.com/otn/java/jdk/11.0.11%2B9/ab2da78f32ed489abb3ff52fd0a02b1c/jdk-11.0.11_linux-x64_bin.tar.gz"
-MD5SUM_x86_64="36eba415122abe0355a8239389f1ab25"
+DOWNLOAD_x86_64="https://download.oracle.com/otn/java/jdk/11.0.12+8/f411702ca7704a54a79ead0c2e0942a3/jdk-11.0.12_linux-x64_bin.tar.gz?AuthParam=1630328792_80e3bfc8ea574dfdd3391fd65ea454d3"
+MD5SUM_x86_64="ce9d5fecc743ab9f808415132938addb"
REQUIRES=""
MAINTAINER="Igor Alexandrov"
EMAIL="igor.alexandrov@outlook.com"
diff --git a/development/jeex/jeex.SlackBuild b/development/jeex/jeex.SlackBuild
index 09e5744078..792f621a7e 100644
--- a/development/jeex/jeex.SlackBuild
+++ b/development/jeex/jeex.SlackBuild
@@ -2,27 +2,18 @@
# Slackware build script for jeex
-# Originally by Luis Henrique <lmello.009@gmail.com>
-# Modified by Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
+# Originally by Luis Henrique <email removed>
+# Modified by Ryan P.C. McQuen | Everett, WA | <email removed>
# Now maintained by B. Watson (yalhcru@gmail.com)
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version, with the following exception:
-# the text of the GPL license may be omitted.
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-# This program is distributed in the hope that it will be useful, but
-# without any warranty; without even the implied warranty of
-# merchantability or fitness for a particular purpose. Compiling,
-# interpreting, executing or merely reading the text of the program
-# may result in lapses of consciousness and/or very being, up to and
-# including the end of all existence and the Universe as we know it.
-# See the GNU General Public License for more details.
-
-# You may have received a copy of the GNU General Public License along
-# with this program (most likely, a file named COPYING). If not, see
-# <http://www.gnu.org/licenses/>.
+# 20210902 bkw:
+# - BUILD=4
+# - fix build on -current/15
+# - relicensed as WTFPL, with permission from Ryan. The original author,
+# Luis, never included a license at all.
+# - Put .desktop file in the right place and fix its icon reference.
# 20170309 bkw:
# - take over maintenance
@@ -38,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=jeex
VERSION=${VERSION:-12.6.1}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -50,9 +41,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
@@ -96,6 +84,9 @@ touch NEWS AUTHORS
rm -f configure
autoreconf -if
+# 20210902 bkw: need for 15.0
+SLKCFLAGS+=" -fcommon"
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -114,6 +105,17 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# 20210902 bkw: .desktop was being installed in wrong place, and needs
+# the icon fixed anyway.
+rm -rf $PKG/usr/share/jeex/applications
+mkdir -p $PKG/usr/share/applications
+sed '/^Icon/s,jeex,/usr/share/jeex/icons/jeex.png,' \
+ < jeex.desktop \
+ > $PKG/usr/share/applications/jeex.desktop
+
+# 20210902 bkw: don't need 2 actual copies of the icon.
+rm -f $PKG/usr/share/jeex/images/jeex.png
+ln -s ../icons/jeex.png $PKG/usr/share/jeex/images/jeex.png
mv $PKG/etc/jeex.rc $PKG/etc/jeex.rc.new
mkdir -p $PKG/install
diff --git a/development/kdiff3/README b/development/kdiff3/README
index fec26dc27f..758e159960 100644
--- a/development/kdiff3/README
+++ b/development/kdiff3/README
@@ -1,22 +1,17 @@
-KDiff3 is a program that
- * compares or merges two or three text input files or directories,
- * shows the differences line by line and character by character (!),
- * provides an automatic merge-facility and
- * an integrated editor for comfortable solving of merge-conflicts,
- * supports Unicode, UTF-8 and other codecs, autodetection via
- byte-order-mark "BOM"
- * supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.),
- * Printing of differences,
- * Manual alignment of lines,
- * Automatic merging of version control history ($Log$),
- * and has an intuitive graphical user interface.
- * Windows-Explorer integration Diff-Ext-for-KDiff3 - shell
- extension included in installer (originally by Sergey Zorin;
- see also Diff Ext)
- * Read what else is special in a short abstract (PDF).
+KDiff3 is a file and folder diff and merge tool which
+ * compares and merges two or three text input files or folders,
+ * shows the differences line by line and character by character(!),
+ * provides an automatic merge-facility,
+ * has an editor for comfortable solving of merge-conflicts,
+ * provides network transparency via KIO,
+ * option for highlight or hide changes in white-space or comments,
+ * supports Unicode, UTF-8 and other file encodings,
+ * prints differences,
+ * supports version control keyword and history merging.
-NOTE: By default, a KDE version is compiled. If you prefer a Qt4-only
-version, pass the script QT4ONLY=yes, like:
+KDiff3 is a KDE Application
+KDiff3 requires KDE Frameworks packages provided by Slackware
+
+NOTE: The historical Qt4-only build has not been ported to Qt5.
-QT4ONLY=yes ./kdiff3.SlackBuild
diff --git a/development/kdiff3/kdiff3.SlackBuild b/development/kdiff3/kdiff3.SlackBuild
index 8613f93268..0abea60463 100644
--- a/development/kdiff3/kdiff3.SlackBuild
+++ b/development/kdiff3/kdiff3.SlackBuild
@@ -27,7 +27,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=kdiff3
-VERSION=${VERSION:-0.9.98}
+VERSION=${VERSION:-1.9.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -73,7 +73,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -138,7 +138,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog README TODO \
+cp -a AUTHORS COPYING ChangeLog INSTALL README doc \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
diff --git a/development/kdiff3/kdiff3.info b/development/kdiff3/kdiff3.info
index 7dbb3a6be1..da9717962f 100644
--- a/development/kdiff3/kdiff3.info
+++ b/development/kdiff3/kdiff3.info
@@ -1,8 +1,8 @@
PRGNAM="kdiff3"
-VERSION="0.9.98"
-HOMEPAGE="http://kdiff3.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/kdiff3/kdiff3-0.9.98.tar.gz"
-MD5SUM="b52f99f2cf2ea75ed5719315cbf77446"
+VERSION="1.9.3"
+HOMEPAGE="https://apps.kde.org/kdiff3/"
+DOWNLOAD="https://download.kde.org/stable/kdiff3/kdiff3-1.9.3.tar.xz"
+MD5SUM="7f90489aa8f1e62cb37a297c4d9788fd"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/kdiff3/slack-desc b/development/kdiff3/slack-desc
index 713ea8c8fe..703e43d15d 100644
--- a/development/kdiff3/slack-desc
+++ b/development/kdiff3/slack-desc
@@ -15,5 +15,5 @@ kdiff3: automatic merge-facility, has an editor for comfortable solving of
kdiff3: merge-conflicts, provides network transparency via KIO, has options to
kdiff3: highlight or hide changes in whitespace or comments, supports Unicode,
kdiff3: UTF-8 and other file encodings, prints differences, supports version
-kdiff3: control keyword and history merging
-kdiff3:
+kdiff3: control keyword and history merging.
+kdiff3: homepage: https://apps.kde.org/kdiff3/
diff --git a/development/kotlin/kotlin.SlackBuild b/development/kotlin/kotlin.SlackBuild
index 4f6bad6880..e5d82fd9d9 100644
--- a/development/kotlin/kotlin.SlackBuild
+++ b/development/kotlin/kotlin.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=kotlin
SRCNAM=kotlin-compiler
-VERSION=${VERSION:-1.5.21}
+VERSION=${VERSION:-1.5.31}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/kotlin/kotlin.info b/development/kotlin/kotlin.info
index ec8f664f8d..3e7b8123ba 100644
--- a/development/kotlin/kotlin.info
+++ b/development/kotlin/kotlin.info
@@ -1,8 +1,8 @@
PRGNAM="kotlin"
-VERSION="1.5.21"
+VERSION="1.5.31"
HOMEPAGE="https://kotlinlang.org/"
-DOWNLOAD="https://github.com/JetBrains/kotlin/releases/download/v1.5.21/kotlin-compiler-1.5.21.zip"
-MD5SUM="ae014dbc86cd6d31b69b6046c5150fdf"
+DOWNLOAD="https://github.com/JetBrains/kotlin/releases/download/v1.5.31/kotlin-compiler-1.5.31.zip"
+MD5SUM="91c9d9351c581d7331c780a77f9ce47a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="jdk setconf"
diff --git a/development/lazarus/README b/development/lazarus/README
index 962953e383..b4018e6b92 100644
--- a/development/lazarus/README
+++ b/development/lazarus/README
@@ -1,3 +1,5 @@
+lazarus (rapid application development tool for freepascal)
+
Lazarus is a Rapid Application Development Tool for FreePascal. It
comes with the LCL - Lazarus Component Library, which contains platform
independent visual components like buttons, windows, checkbox, treeview
diff --git a/development/lazarus/lazarus.SlackBuild b/development/lazarus/lazarus.SlackBuild
index 11b00e1d66..f0b5b59e27 100644
--- a/development/lazarus/lazarus.SlackBuild
+++ b/development/lazarus/lazarus.SlackBuild
@@ -2,7 +2,8 @@
# Slackware build script for Lazarus IDE
-# Written by Andre Barboza <bmg.andre@gmail.com>
+# Written by Andre Barboza <email removed>
+# Now maintained by B. Watson <yalhcru@gmail.com>
# Redistribution and use of this script, with or without modification, is
# permitted provided that the following conditions are met:
@@ -21,19 +22,22 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20210905 bkw:
+# - take over maintenance
+# - update for v2.0.12
+# - get rid of fpc-source dep; include the source in this package
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=lazarus
-VERSION=${VERSION:-2.0.6}
+VERSION=${VERSION:-2.0.12}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
+FPCVER=${FPCVER:-3.2.2}
LCL=${LCL:-gtk2}
-# 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
@@ -57,18 +61,20 @@ fi
set -e
+fixperms() {
+ chown -R root:root .
+ find -L . -type l -o \
+ -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+}
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+fixperms
sed -i -e 's:share/man:man:' install/man/Makefile
@@ -89,8 +95,21 @@ make install \
ln -sf ../share/lazarus/startlazarus
)
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find $PKG -print0 -type f -a -perm /111 | \
+ xargs -0 file -m /etc/file/magic/elf | \
+ grep -e "executable" -e "shared object" | \
+ grep ELF | \
+ cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null || true
+
+# 20210905 bkw: Nothing used fpc-source but lazarus, so just include
+# the source here.
+mkdir -p $PKG/usr/src
+( cd $PKG/usr/src
+ tar xvf $CWD/fpc-$FPCVER.source.tar.gz
+ fixperms
+ ln -s fpc-$FPCVER fpc
+)
# Install desktop file, icon, and mime entry
mkdir -p $PKG/usr/share/{applications,pixmaps,mime/packages}
diff --git a/development/lazarus/lazarus.info b/development/lazarus/lazarus.info
index 2f094c1ea1..d14cd7ecbd 100644
--- a/development/lazarus/lazarus.info
+++ b/development/lazarus/lazarus.info
@@ -1,10 +1,12 @@
PRGNAM="lazarus"
-VERSION="2.0.6"
+VERSION="2.0.12"
HOMEPAGE="http://www.lazarus.freepascal.org/"
-DOWNLOAD="http://downloads.sourceforge.net/lazarus/lazarus-2.0.6.tar.gz"
-MD5SUM="2e7006ae8af2c52f7e4db0039bf1c6af"
+DOWNLOAD="http://downloads.sourceforge.net/lazarus/lazarus-2.0.12.tar.gz \
+ https://downloads.sourceforge.net/freepascal/fpc-3.2.2.source.tar.gz"
+MD5SUM="208dfeb20c528649d2598cc0eb341309 \
+ e7649ad0fc9230fdd9493a7fcabbd426"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="fpc fpc-source"
-MAINTAINER="Capi X."
-EMAIL="capi_x@haibane.org"
+REQUIRES="fpc"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/development/lazarus/slack-desc b/development/lazarus/slack-desc
index e6b8d70594..8872f667bc 100644
--- a/development/lazarus/slack-desc
+++ b/development/lazarus/slack-desc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-lazarus: lazarus (Rapid Application Development Tool for FreePascal)
+lazarus: lazarus (rapid application development tool for freepascal)
lazarus:
lazarus: Lazarus is a Rapid Application Development Tool for FreePascal.
lazarus: It comes with the LCL - Lazarus component library, which contains
diff --git a/development/love-legacy072/love-legacy072.SlackBuild b/development/love-legacy072/love-legacy072.SlackBuild
index 03d26ef7e7..80edad1cbc 100644
--- a/development/love-legacy072/love-legacy072.SlackBuild
+++ b/development/love-legacy072/love-legacy072.SlackBuild
@@ -6,16 +6,20 @@
# Modified for 0.7.2 legacy version by B. Watson (yalhcru@gmail.com)
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
# If you're packaging up a LÖVE game that needs this version (won't work
# with 0.8), make sure the shebang line in the .love file says:
# #!/usr/bin/env love-0.7.2
# See notpacman.SlackBuild for an example.
+# 20210903 bkw: fix build for current/pre15, BUILD=2
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=love-legacy072
VERSION=${VERSION:-0.7.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -27,9 +31,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
@@ -66,11 +67,10 @@ rm -rf $SRCNAM-$SRCVER
tar xvf $CWD/$SRCNAM-$VERSION-linux-src.tar.gz
cd $SRCNAM-$SRCVER
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+patch -p1 < $CWD/newmesafix.diff
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/development/love-legacy072/love-legacy072.info b/development/love-legacy072/love-legacy072.info
index 15c0fad7e6..8221218632 100644
--- a/development/love-legacy072/love-legacy072.info
+++ b/development/love-legacy072/love-legacy072.info
@@ -1,6 +1,6 @@
PRGNAM="love-legacy072"
VERSION="0.7.2"
-HOMEPAGE="http://love2d.org"
+HOMEPAGE="https://love2d.org"
DOWNLOAD="https://github.com/love2d/love/releases/download/0.7.2/love-0.7.2-linux-src.tar.gz"
MD5SUM="c3e678606bb9a870c31168e85b269e7e"
DOWNLOAD_x86_64=""
diff --git a/development/love-legacy072/newmesafix.diff b/development/love-legacy072/newmesafix.diff
new file mode 100644
index 0000000000..c60186cf35
--- /dev/null
+++ b/development/love-legacy072/newmesafix.diff
@@ -0,0 +1,15 @@
+diff -Naur love-HEAD/src/modules/graphics/opengl/GLee.h love-HEAD.patched/src/modules/graphics/opengl/GLee.h
+--- love-HEAD/src/modules/graphics/opengl/GLee.h 2011-05-04 12:00:10.000000000 -0400
++++ love-HEAD.patched/src/modules/graphics/opengl/GLee.h 2021-09-03 14:16:42.123563880 -0400
+@@ -62,8 +62,9 @@
+ #define GL_GLEXT_LEGACY
+ #include <OpenGL/gl.h>
+ #else // GLX
+- #define __glext_h_ /* prevent glext.h from being included */
+- #define __glxext_h_ /* prevent glxext.h from being included */
++ #define GL_GLEXT_LEGACY
++ #define GLX_GLEXT_LEGACY
++ #define GLX_GLXEXT_LEGACY
+ #define GLX_GLXEXT_PROTOTYPES
+ #include <GL/gl.h>
+ #include <GL/glx.h>
diff --git a/development/love-legacy080/love-legacy080.SlackBuild b/development/love-legacy080/love-legacy080.SlackBuild
index 8b2162ef64..543d406076 100644
--- a/development/love-legacy080/love-legacy080.SlackBuild
+++ b/development/love-legacy080/love-legacy080.SlackBuild
@@ -11,6 +11,8 @@
# #!/usr/bin/env love-0.8.0
# See mari0.SlackBuild for an example.
+# 20210903 bkw: fix build for current/pre15.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=love-legacy080
@@ -27,9 +29,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
@@ -64,11 +63,11 @@ rm -rf $SRCNAM-$VERSION
tar xvf $CWD/$SRCNAM-$VERSION-linux-src.tar.gz
cd $SRCNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# this is the same patch as love-legacy072
+patch -p1 < $CWD/newmesafix.diff
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/development/love-legacy080/love-legacy080.info b/development/love-legacy080/love-legacy080.info
index f8bf38d21a..191d761006 100644
--- a/development/love-legacy080/love-legacy080.info
+++ b/development/love-legacy080/love-legacy080.info
@@ -1,6 +1,6 @@
PRGNAM="love-legacy080"
VERSION="0.8.0"
-HOMEPAGE="http://love2d.org"
+HOMEPAGE="https://love2d.org"
DOWNLOAD="https://github.com/love2d/love/releases/download/0.8.0/love-0.8.0-linux-src.tar.gz"
MD5SUM="9db9c32585fc7c7da3eba7e438783099"
DOWNLOAD_x86_64=""
diff --git a/development/love-legacy080/newmesafix.diff b/development/love-legacy080/newmesafix.diff
new file mode 100644
index 0000000000..c60186cf35
--- /dev/null
+++ b/development/love-legacy080/newmesafix.diff
@@ -0,0 +1,15 @@
+diff -Naur love-HEAD/src/modules/graphics/opengl/GLee.h love-HEAD.patched/src/modules/graphics/opengl/GLee.h
+--- love-HEAD/src/modules/graphics/opengl/GLee.h 2011-05-04 12:00:10.000000000 -0400
++++ love-HEAD.patched/src/modules/graphics/opengl/GLee.h 2021-09-03 14:16:42.123563880 -0400
+@@ -62,8 +62,9 @@
+ #define GL_GLEXT_LEGACY
+ #include <OpenGL/gl.h>
+ #else // GLX
+- #define __glext_h_ /* prevent glext.h from being included */
+- #define __glxext_h_ /* prevent glxext.h from being included */
++ #define GL_GLEXT_LEGACY
++ #define GLX_GLEXT_LEGACY
++ #define GLX_GLXEXT_LEGACY
+ #define GLX_GLXEXT_PROTOTYPES
+ #include <GL/gl.h>
+ #include <GL/glx.h>
diff --git a/development/love/love.SlackBuild b/development/love/love.SlackBuild
index 7c533f0255..5f1773677a 100644
--- a/development/love/love.SlackBuild
+++ b/development/love/love.SlackBuild
@@ -7,6 +7,7 @@
# Original version had no license; modified version licensed under the
# WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210902 bkw: BUILD=2, get rid of .la file
# 20200415 bkw:
# - take over maintenance
# - update for v11.3
@@ -15,7 +16,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=love
VERSION=${VERSION:-11.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -27,9 +28,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
@@ -80,6 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install-strip DESTDIR=$PKG
gzip $PKG/usr/man/man1/$PRGNAM.1
+rm -f $PKG/usr/lib$LIBDIRSUFFIX/*.la
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a changes.txt license.txt readme.md $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/development/love/love.info b/development/love/love.info
index 2b3af9083a..f95606e736 100644
--- a/development/love/love.info
+++ b/development/love/love.info
@@ -1,7 +1,7 @@
PRGNAM="love"
VERSION="11.3"
-HOMEPAGE="http://love2d.org"
-DOWNLOAD="https://bitbucket.org/rude/love/downloads/love-11.3-linux-src.tar.gz"
+HOMEPAGE="https://love2d.org"
+DOWNLOAD="https://github.com/love2d/love/releases/download/11.3/love-11.3-linux-src.tar.gz"
MD5SUM="21fb1630b1edfe7b0699bc10abe2d9a0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/development/ltrace/ltrace.SlackBuild b/development/ltrace/ltrace.SlackBuild
index c346613c55..d830d97ff1 100644
--- a/development/ltrace/ltrace.SlackBuild
+++ b/development/ltrace/ltrace.SlackBuild
@@ -24,9 +24,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
@@ -64,11 +61,8 @@ tar xvf $CWD/${PRGNAM}_$SRCVER.orig.tar.bz2
cd $PRGNAM-$SRCVER
tar xvf $CWD/${PRGNAM}_$SRCVER-$DEBVER.debian.tar.?z debian/patches
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# apply Debian's patches, which fix a few bugs.
for i in $( cat debian/patches/series ); do
diff --git a/development/ltrace/ltrace.info b/development/ltrace/ltrace.info
index f170aad406..25c259afd6 100644
--- a/development/ltrace/ltrace.info
+++ b/development/ltrace/ltrace.info
@@ -1,8 +1,8 @@
PRGNAM="ltrace"
VERSION="0.7.3_6"
-HOMEPAGE="http://ltrace.org/"
-DOWNLOAD="http://ltrace.org/ltrace_0.7.3.orig.tar.bz2 \
- http://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.7.3-6.debian.tar.xz"
+HOMEPAGE="https://ltrace.org/"
+DOWNLOAD="https://ltrace.org/ltrace_0.7.3.orig.tar.bz2 \
+ https://deb.debian.org/debian/pool/main/l/ltrace/ltrace_0.7.3-6.debian.tar.xz"
MD5SUM="b3dd199af8f18637f7d4ef97fdfb9d14 \
c4b0aa923d25b5828720157fd99c3a20"
DOWNLOAD_x86_64=""
diff --git a/development/mads/mads.SlackBuild b/development/mads/mads.SlackBuild
index 58c06b4726..aeedc18a5d 100644
--- a/development/mads/mads.SlackBuild
+++ b/development/mads/mads.SlackBuild
@@ -6,10 +6,12 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210903 bkw: update for v2.1.3.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=mads
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.1.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +24,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
@@ -36,16 +35,19 @@ OUTPUT=${OUTPUT:-/tmp}
set -e
+SRCNAM=Mad-Assembler
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-7za x $CWD/${PRGNAM}_${VERSION//./}.7z
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z
+cd $SRCNAM-$VERSION
+
+# upstream's permissions are still horrid, even after all this time...
+find . -iname \*.exe -print0 | xargs -0 rm -f
find . -type f -print0 | xargs -0 chmod 644
find . -type d -print0 | xargs -0 chmod 755
-find . -iname \*.exe -print0 | xargs -0 rm -f
chown -R root:root .
# Build & install the binary.
@@ -64,7 +66,7 @@ cp -a syntax/vim-mads-master/LICENSE \
PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
mkdir -p $PKGDOC
-for i in examples readme doc; do
+for i in examples readme doc CHANGELOG README.md; do
[ -e "$i" ] && cp -a "$i" $PKGDOC
done
cat $CWD/README > $PKGDOC/README
diff --git a/development/mads/mads.info b/development/mads/mads.info
index 0a44a7b712..ecd0025d9c 100644
--- a/development/mads/mads.info
+++ b/development/mads/mads.info
@@ -1,10 +1,10 @@
PRGNAM="mads"
-VERSION="2.1.0"
-HOMEPAGE="http://mads.atari8.info/"
-DOWNLOAD="http://mads.atari8.info/mads_210.7z"
-MD5SUM="dcf835bc119e50af4f004bdf838b0cff"
+VERSION="2.1.3"
+HOMEPAGE="https://mads.atari8.info/"
+DOWNLOAD="https://github.com/tebe6502/Mad-Assembler/archive/2.1.3/Mad-Assembler-2.1.3.tar.gz"
+MD5SUM="34c650ccffcb9bac6c33788a29b8c7db"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="p7zip fpc"
+REQUIRES="fpc"
MAINTAINER="B. Watson"
EMAIL="yalhcru@gmail.com"
diff --git a/development/mawk/mawk.SlackBuild b/development/mawk/mawk.SlackBuild
index 8fc4bb1ad4..7de4607392 100644
--- a/development/mawk/mawk.SlackBuild
+++ b/development/mawk/mawk.SlackBuild
@@ -27,9 +27,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
diff --git a/development/mawk/mawk.info b/development/mawk/mawk.info
index c3f4b52607..07a35c5557 100644
--- a/development/mawk/mawk.info
+++ b/development/mawk/mawk.info
@@ -1,7 +1,7 @@
PRGNAM="mawk"
VERSION="1.3.4_20200120"
HOMEPAGE="http://invisible-island.net/mawk/mawk.html"
-DOWNLOAD="ftp://ftp.invisible-island.net/mawk/mawk-1.3.4-20200120.tgz"
+DOWNLOAD="https://invisible-mirror.net/archives/mawk/mawk-1.3.4-20200120.tgz"
MD5SUM="d48752f402d7371d9eb5f68de3da05d4"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/development/meld3/meld3.SlackBuild b/development/meld3/meld3.SlackBuild
index e8d35f78c4..97fecd5063 100644
--- a/development/meld3/meld3.SlackBuild
+++ b/development/meld3/meld3.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=meld3
SRCNAM=meld
-VERSION=${VERSION:-3.20.3}
+VERSION=${VERSION:-3.20.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/meld3/meld3.info b/development/meld3/meld3.info
index ca13d770f8..e6e7183b79 100644
--- a/development/meld3/meld3.info
+++ b/development/meld3/meld3.info
@@ -1,8 +1,8 @@
PRGNAM="meld3"
-VERSION="3.20.3"
+VERSION="3.20.4"
HOMEPAGE="http://meldmerge.org/"
-DOWNLOAD="https://download.gnome.org/sources/meld/3.20/meld-3.20.3.tar.xz"
-MD5SUM="28bd16508e9c966d04184c16046cbadb"
+DOWNLOAD="https://download.gnome.org/sources/meld/3.20/meld-3.20.4.tar.xz"
+MD5SUM="318b98861d546526fc122dea9dc90257"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/mongodb-compass/mongodb-compass.SlackBuild b/development/mongodb-compass/mongodb-compass.SlackBuild
index f30db1339f..4908dc1354 100644
--- a/development/mongodb-compass/mongodb-compass.SlackBuild
+++ b/development/mongodb-compass/mongodb-compass.SlackBuild
@@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=mongodb-compass
-VERSION=${VERSION:-1.28.1}
+VERSION=${VERSION:-1.28.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/mongodb-compass/mongodb-compass.info b/development/mongodb-compass/mongodb-compass.info
index dff208504a..eabafeca66 100644
--- a/development/mongodb-compass/mongodb-compass.info
+++ b/development/mongodb-compass/mongodb-compass.info
@@ -1,10 +1,10 @@
PRGNAM="mongodb-compass"
-VERSION="1.28.1"
+VERSION="1.28.4"
HOMEPAGE="https://www.mongodb.com/products/compass"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://downloads.mongodb.com/compass/mongodb-compass-1.28.1.x86_64.rpm"
-MD5SUM_x86_64="3f4942250b045c699ba2f4148a73f220"
+DOWNLOAD_x86_64="https://downloads.mongodb.com/compass/mongodb-compass-1.28.4.x86_64.rpm"
+MD5SUM_x86_64="2c9e778097e341c6df7cab96303e2411"
REQUIRES=""
MAINTAINER="Willy Sudiarto Raharjo"
EMAIL="willysr@slackbuilds.org"
diff --git a/development/nchexedit/nchexedit.SlackBuild b/development/nchexedit/nchexedit.SlackBuild
index 4af50b5820..c51ffb3de0 100644
--- a/development/nchexedit/nchexedit.SlackBuild
+++ b/development/nchexedit/nchexedit.SlackBuild
@@ -13,11 +13,13 @@
# We're using most of Debian's patches, the _5 in VERSION is their
# patchlevel.
+# 20210905 bkw: update for v0.9.7_7.1, fix -current segfault issue.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=nchexedit
-VERSION=${VERSION:-0.9.7_5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.9.7_7.1}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -34,9 +36,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,7 +80,8 @@ rm -f debian/patches/fix_hexedit_references.patch \
debian/patches/info_dir_section.patch \
debian/patches/rename_binaries.patch \
debian/patches/autoconf_2.69.patch \
- debian/patches/fix_its_typo.patch
+ debian/patches/fix_its_typo.patch \
+ debian/patches/fix_spelling_errors.patch
chown -R root:root .
find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
@@ -90,7 +90,7 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
# Apply the patches we didn't rm.
for i in $( cat debian/patches/series ); do
P=debian/patches/$i
- [ -e $P ] && patch -p1 < $P
+ [ -e $P ] && echo "=== $P" && patch -p1 < $P
done
# Reworked version of Debian patch.
@@ -101,15 +101,21 @@ sed -i \
-e 's/hexedit/nchexedit/g' \
-e 's/Hexedit/NCHexedit/g' \
-e 's/HEXEDIT/NCHEXEDIT/g' \
- -e '/utexas\.edu/s#{http[^}]*}#{http://www.rogoyski.com/adam/programs/hexedit/}#' \
+ -e '/utexas\.edu/s#{http[^}]*}#{https://www.rogoyski.com/adam/programs/hexedit/}#' \
docs/$SRCNAM.1
# ...nor the info file.
sed -i \
-e 's/hexedit/nchexedit/g' \
- -e '/utexas\.edu/s#{http[^}]*}#{http://www.rogoyski.com/adam/programs/hexedit/}#' \
+ -e '/utexas\.edu/s#{http[^}]*}#{https://www.rogoyski.com/adam/programs/hexedit/}#' \
docs/$SRCNAM.texinfo
+# 20210905 bkw: required for -current (but why?). Without this, it segfaults
+# on startup.
+sed -i 's,-lncurses,-lncursesw,g' configure
+
+SLKCFLAGS+=" -fcommon"
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/development/nchexedit/nchexedit.info b/development/nchexedit/nchexedit.info
index 29cfa1ad79..c720df0018 100644
--- a/development/nchexedit/nchexedit.info
+++ b/development/nchexedit/nchexedit.info
@@ -1,10 +1,10 @@
PRGNAM="nchexedit"
-VERSION="0.9.7_5"
-HOMEPAGE="http://www.rogoyski.com/adam/programs/hexedit/"
-DOWNLOAD="http://www.rogoyski.com/adam/programs/hexedit/hexedit-0.9.7.tar.gz \
- https://slackware.uk/~urchlay/src/ncurses-hexedit_0.9.7+orig-5.debian.tar.xz"
+VERSION="0.9.7_7.1"
+HOMEPAGE="https://www.rogoyski.com/adam/programs/hexedit/"
+DOWNLOAD="https://www.rogoyski.com/adam/programs/hexedit/hexedit-0.9.7.tar.gz \
+ https://slackware.uk/~urchlay/src/ncurses-hexedit_0.9.7+orig-7.1.debian.tar.xz"
MD5SUM="2658b81ab1bd0813c0117e9459071c13 \
- 7fb8575f4709067a06895ca2fdc9712a"
+ 36cfa014777ee632876d8c89f89dfbb1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/neovim/neovim.SlackBuild b/development/neovim/neovim.SlackBuild
index 644750fa04..91a79a0ee9 100644
--- a/development/neovim/neovim.SlackBuild
+++ b/development/neovim/neovim.SlackBuild
@@ -2,6 +2,7 @@
# SlackBuild script for neovim
+# Copyright 2021 Ruben Schuller <sb@rbn.im>
# Copyright 2014-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
# All rights reserved.
#
diff --git a/development/neovim/neovim.info b/development/neovim/neovim.info
index 12c9d684e4..8191280d62 100644
--- a/development/neovim/neovim.info
+++ b/development/neovim/neovim.info
@@ -6,5 +6,5 @@ MD5SUM="df61e5a84096d34596145fff708b940c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="msgpack-c lua-mpack lua-lpeg lua-luv libtermkey libvterm tree-sitter"
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
+MAINTAINER="Ruben Schuller"
+EMAIL="sb@rbn.im"
diff --git a/development/nodejs/nodejs.SlackBuild b/development/nodejs/nodejs.SlackBuild
index eb34ef9ee5..b770e65170 100644
--- a/development/nodejs/nodejs.SlackBuild
+++ b/development/nodejs/nodejs.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=nodejs
SRCNAM=node
-VERSION=${VERSION:-14.17.4}
+VERSION=${VERSION:-16.11.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -84,7 +84,6 @@ find -L . \
## Fix man page path.
sed -i 's|share/||' tools/install.py
-sed -i '/var manRoot/ s/"share",//' deps/npm/lib/{,un}build.js
## Fix libdir for 64-bit.
sed -i "s|lib/|lib${LIBDIRSUFFIX}/|g" tools/install.py
diff --git a/development/nodejs/nodejs.info b/development/nodejs/nodejs.info
index 3f05b75799..8b91c47924 100644
--- a/development/nodejs/nodejs.info
+++ b/development/nodejs/nodejs.info
@@ -1,8 +1,8 @@
PRGNAM="nodejs"
-VERSION="14.17.4"
+VERSION="16.11.1"
HOMEPAGE="https://nodejs.org/"
-DOWNLOAD="https://nodejs.org/dist/v14.17.4/node-v14.17.4.tar.xz"
-MD5SUM="15f38c92b383f663ba0ba084aa4aa01f"
+DOWNLOAD="https://nodejs.org/dist/v16.11.1/node-v16.11.1.tar.xz"
+MD5SUM="10eaae74de4f352471844fb585693779"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/noweb/noweb.SlackBuild b/development/noweb/noweb.SlackBuild
index 5f6f4a00cf..fbadac7d07 100644
--- a/development/noweb/noweb.SlackBuild
+++ b/development/noweb/noweb.SlackBuild
@@ -1,22 +1,42 @@
#!/bin/bash
# Slackware build script for noweb
-# Written by Kyle Guinn <elyk03@gmail.com>
+
+# Copyright 2010-2021 Kyle Guinn <elyk03@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# 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=noweb
-VERSION=${VERSION:-2.11b}
+VERSION=${VERSION:-2.12}
+SRCVER=$(echo $VERSION | tr . _)
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
- case "$(uname -m)" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$(uname -m) ;;
- esac
+ case "$(uname -m)" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$(uname -m) ;;
+ esac
fi
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
@@ -31,20 +51,23 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM-$VERSION
OUTPUT=${OUTPUT:-/tmp}
-DOCS="CHANGES COPYRIGHT DATE README examples/"
+DOCS="CHANGES COPYRIGHT LICENSE README examples/"
if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e
@@ -52,18 +75,16 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod -R u+w,go-w,a+rX-st .
-# Adds destdir support along with various other simplifications
-patch -p1 < $CWD/make_cleanup.diff
+# Adds PREFIX and DESTDIR support along with various other simplifications
+patch -p1 < $CWD/patches/make_cleanup.diff
+# Needed to bootstrap
+patch -p1 < $CWD/patches/toascii.diff
# Postpone texhash until doinst.sh
sed -i 's/texhash/true/g' src/Makefile
@@ -72,17 +93,16 @@ sed -i 's/texhash/true/g' src/Makefile
(cd src && ./awkname awk)
make -j1 -C src all install \
- ICONC="icont" \
- LIBSRC="icon" \
- BIN="/usr/bin" \
- LIB="/usr/libexec/$PRGNAM" \
- MAN="/usr/man" \
- TEXINPUTS="/usr/share/texmf-local/tex/latex/$PRGNAM" \
- ELISP="/usr/share/emacs/site-lisp" \
- CFLAGS="$SLKCFLAGS -DTEMPNAM" \
- DESTDIR="$PKG"
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+ ICONC="icont" \
+ LIBSRC="icon" \
+ PREFIX="/usr" \
+ MAN="/usr/man" \
+ TEXINPUTS="/usr/share/texmf-local/tex/latex/$PRGNAM" \
+ ELISP="/usr/share/emacs/site-lisp" \
+ CFLAGS="$SLKCFLAGS" \
+ DESTDIR="$PKG"
+
+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
diff --git a/development/noweb/noweb.info b/development/noweb/noweb.info
index 6a410783c8..eb65898c44 100644
--- a/development/noweb/noweb.info
+++ b/development/noweb/noweb.info
@@ -1,8 +1,8 @@
PRGNAM="noweb"
-VERSION="2.11b"
-HOMEPAGE="http://www.cs.tufts.edu/~nr/noweb/"
-DOWNLOAD="ftp://www.eecs.harvard.edu/pub/nr/noweb-2.11b.tgz"
-MD5SUM="1df580723497b2f2efde07646abf764c"
+VERSION="2.12"
+HOMEPAGE="https://www.cs.tufts.edu/~nr/noweb/"
+DOWNLOAD="https://github.com/nrnrnr/noweb/archive/v2_12/noweb-2_12.tar.gz"
+MD5SUM="a1b27919429c70398251584bd03d94ab"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="icon"
diff --git a/development/noweb/make_cleanup.diff b/development/noweb/patches/make_cleanup.diff
index a574778b38..72c23f08e8 100644
--- a/development/noweb/make_cleanup.diff
+++ b/development/noweb/patches/make_cleanup.diff
@@ -1,37 +1,38 @@
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
-@@ -9,14 +9,16 @@
- CINAME=-Nv`echo $(VERSION) | tr . _`
- CIMSG=-f -m'standard checkin preparing to export version $(VERSION)'
-
+@@ -12,14 +12,16 @@
+ all:
+ @echo "You have no business running 'make' here; please look at the README file"
+ @exit 1
-source: ; for i in src; do (cd $$i; make source); done
-www: ; for i in src/xdoc examples; do (cd $$i; make www); done
+source:
-+ for i in src; do ($(MAKE) -C $$i source); done
++ for i in src; do $(MAKE) -C $$i $@; done
+www:
-+ for i in src/xdoc examples; do ($(MAKE) -C $$i www); done
++ for i in src/xdoc examples; do $(MAKE) -C $$i $@; done
clean:
- for i in src examples contrib; do (cd $$i; make clean); done
- rm -f nwsrcfilter *~ */*~
-+ for i in src examples contrib; do ($(MAKE) -C $$i clean); done
++ for i in src examples contrib; do $(MAKE) -C $$i $@; done
+ $(RM) nwsrcfilter *~ */*~
clobber: clean
- for i in src examples contrib; do (cd $$i; make clobber); done
-+ for i in src examples contrib; do ($(MAKE) -C $$i clobber); done
++ for i in src examples contrib; do $(MAKE) -C $$i $@; done
DATE:
(./echo -n "Version $(VERSION) of "; date) > DATE
-@@ -36,14 +38,14 @@
+@@ -39,21 +41,21 @@
tarnames: clean source nwsrcfilter DATE
find . -not -type d -not -name FAQ.old -print | ./nwsrcfilter
-tar: clean source nwsrcfilter DATE emacscheck
+tar: clean source nwsrcfilter DATE emacscheck
chmod +w src/Makefile
- rm -rf /tmp/noweb-$(VERSION)
+- rm -rf /tmp/noweb-$(VERSION)
- mkdir /tmp/noweb-$(VERSION)
++ $(RM) -r /tmp/noweb-$(VERSION)
+ mkdir -p /tmp/noweb-$(VERSION)
tar cvf - `find . ! -type d -not -name FAQ.old -print | ./nwsrcfilter` | (cd /tmp/noweb-$(VERSION) ; tar xf - )
(cd /tmp; tar cf - noweb-$(VERSION) ) | gzip -v > ../noweb-$(VERSION).tgz
@@ -41,15 +42,25 @@ diff --git a/Makefile b/Makefile
+ (cd .. && ln -s noweb-$(VERSION).tgz noweb.tgz)
chmod -w src/Makefile
+ ctan: clean source nwsrcfilter DATE emacscheck
+ chmod +w src/Makefile
+- (cd src; make boot)
+- rm -f ../noweb-$(VERSION)-ctan.zip
+- find ./* ! -type d -not -name FAQ.old -not -name '.git*' -print | ./nwsrcfilter | sed 's@^@noweb/@' | ( ln -s . noweb; zip ../noweb-$(VERSION)-ctan.zip -@; rm -f noweb )
++ $(MAKE) -C src boot
++ $(RM) ../noweb-$(VERSION)-ctan.zip
++ find ./* ! -type d -not -name FAQ.old -not -name '.git*' -print | ./nwsrcfilter | sed 's@^@noweb/@' | ( ln -s . noweb; zip ../noweb-$(VERSION)-ctan.zip -@; $(RM) noweb )
+ chmod -w src/Makefile
+
emacscheck:
-@@ -51,6 +53,4 @@
+@@ -61,6 +63,4 @@
diff src/elisp/noweb-mode.el $(HOME)/emacs/noweb-mode.el
checkin:
- (cd src; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin)
-
-
-+ ($(MAKE) -C src "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin)
++ $(MAKE) -C src "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" $@
diff --git a/contrib/Makefile b/contrib/Makefile
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -62,34 +73,37 @@ diff --git a/contrib/Makefile b/contrib/Makefile
-source: ; for i in $(DIRS); do (cd $$i; make source); done
-clean: ; for i in $(DIRS); do (cd $$i; make clean); done
+all:
-+ for i in $(DIRS); do ($(MAKE) -C $$i ICONC=$(ICONC) all); done
++ for i in $(DIRS); do $(MAKE) -C $$i ICONC=$(ICONC) $@; done
+install:
-+ for i in $(DIRS); do ($(MAKE) -C $$i LIB=$(LIB) BIN=$(BIN) install); done
++ for i in $(DIRS); do $(MAKE) -C $$i LIB=$(LIB) BIN=$(BIN) $@; done
+source:
-+ for i in $(DIRS); do ($(MAKE) -C $$i source); done
++ for i in $(DIRS); do $(MAKE) -C $$i $@; done
+clean:
-+ for i in $(DIRS); do ($(MAKE) -C $$i clean); done
++ for i in $(DIRS); do $(MAKE) -C $$i $@; done
clobber: clean
-
diff --git a/contrib/conrado/Makefile b/contrib/conrado/Makefile
--- a/contrib/conrado/Makefile
+++ b/contrib/conrado/Makefile
-@@ -1,7 +1,8 @@
+@@ -1,15 +1,16 @@
LIB=/dev/null # to be overridden by install
.SUFFIXES: .nw .icn
-.nw.icn: ; notangle -L'#line %-1L "%F"%N' $*.nw | cpif $*.icn
+.nw.icn:
-+ notangle -L'#line %-1L "%F"%N' $*.nw | cpif $*.icn
++ notangle -L'#line %-1L "%F"%N' $< | cpif $@
all: d2tex
source: d2tex
-@@ -10,6 +11,6 @@
+-install:
+- cp d2tex $(LIB)/dijkstra.filter
++install: all
++ cp d2tex $(DESTDIR)$(LIB)/dijkstra.filter
# TeX files.
hospital.tex: hospital.nw d2tex
- noweave -delay -filter ./d2tex hospital.nw > hospital.tex
-+ noweave -delay -filter $^ > $@
++ noweave -delay -filter ./d2tex $< > $@
clean:
- /bin/rm -f hospital.tex *.dvi *.aux *.log *.blg *.bbl *~
+ $(RM) hospital.tex *.dvi *.aux *.log *.blg *.bbl *~
@@ -105,7 +119,9 @@ diff --git a/contrib/davelove/Makefile b/contrib/davelove/Makefile
diff --git a/contrib/jobling/Makefile b/contrib/jobling/Makefile
--- a/contrib/jobling/Makefile
+++ b/contrib/jobling/Makefile
-@@ -1,9 +1,9 @@
+@@ -1,15 +1,17 @@
++BIN = /dev/null # to be overridden
++LIB = /dev/null # to be overridden
PROG = correct-refs
-DOCSRC = $(PROG).tex
-PROGSRC = $(PROG).csh
@@ -118,8 +134,23 @@ diff --git a/contrib/jobling/Makefile b/contrib/jobling/Makefile
correct-refs.tex: correct-refs.nw
noweave -delay -index $< > $@
-@@ -22,13 +22,13 @@
- cp *.awk $(HOME)/lib
+
+ correct-refs.csh: correct-refs.nw
+- notangle -Rcorrect-refs.csh $< | cpif $@
++ notangle -R$@ $< | cpif $@
+ chmod +x $@
+
+ all-scripts: correct-refs.nw
+@@ -17,18 +19,18 @@
+ notangle -Rawk-scripts.awk $< | cpif awk-scripts.awk
+ touch all-scripts
+
+-install:
+- cp correct-refs.csh $(HOME)/bin
+- cp *.awk $(HOME)/lib
++install: correct-refs.csh all-scripts
++ cp correct-refs.csh $(DESTDIR)$(BIN)
++ cp *.awk $(DESTDIR)$(LIB)
tidy:
- -rm *~ *% *.bak *.log *.blg
@@ -138,20 +169,133 @@ diff --git a/contrib/jobling/Makefile b/contrib/jobling/Makefile
diff --git a/contrib/jonkrom/Makefile b/contrib/jonkrom/Makefile
--- a/contrib/jonkrom/Makefile
+++ b/contrib/jonkrom/Makefile
-@@ -9,7 +9,7 @@
+@@ -1,15 +1,15 @@
+ LIB=/dev/null # override for installation
+ SHELL=/bin/sh
+ all: noxref.krom
+- chmod +x noxref.krom
+
+-install:
+- cp noxref.krom $(LIB)
++install: all
++ cp noxref.krom $(DESTDIR)$(LIB)
+
source: noxref.krom
noxref.krom: noxref.nw
- notangle -Rnoxref noxref.nw > noxref.krom
+ notangle -Rnoxref $< > $@
++ chmod +x $@
clean:
- /bin/rm -f *.tex *.dvi *.ilg *.idx *.aux *.log *.blg *.bbl *~ *.ind noxref.krom
+ $(RM) *.tex *.dvi *.ilg *.idx *.aux *.log *.blg *.bbl *~ *.ind noxref.krom
+diff --git a/contrib/kostas/Makefile.gnu b/contrib/kostas/Makefile.gnu
+--- a/contrib/kostas/Makefile.gnu
++++ b/contrib/kostas/Makefile.gnu
+@@ -1,6 +1,6 @@
+ # Only works with Gnu make.
+
+-LIB=/opt/noweb/lib
++LIB=/dev/null # to be overridden
+ ICONC=icont
+ # This is supposed to be the defns.nw file in the icon directory of the distribution.
+ defns=defns.nw
+@@ -10,36 +10,36 @@
+ .SUFFIXES: .nw .icn .tex .dvi
+
+
+-all: C.filter C++.filter icon.filter oot.filter math.filter\
+- autodefs.oot autodefs.math
++all: C.filter C++.filter icon.filter oot.filter math.filter \
++ autodefs.oot autodefs.math
+
+-install:
+- mv *.filter $(LIB)
+- mv autodefs.* $(LIB)
++install: all
++ cp *.filter $(DESTDIR)$(LIB)
++ cp autodefs.* $(DESTDIR)$(LIB)
+
+
+ # TeX files.
+-%.tex : %.nw
++%.tex: %.nw
+ $(WEAVE) $< > $@
+ pp.tex: pp.nw
+- noweave -delay -autodefs icon -filter icon.filter -index pp.nw > pp.tex
+-%.dvi : %.tex
++ noweave -delay -autodefs icon -filter icon.filter -index $< > $@
++%.dvi: %.tex
+ latex $<
+ # Don't delete the intermediate .tex file.
+-.PRECIOUS : %.tex
++.PRECIOUS: %.tex
+
+
+ # Icon files.
+-C.icn: pp.nw C_translation_table
+- $(TANGLE) -R"C" pp.nw > $@
+-C++.icn: pp.nw C++_translation_table
+- $(TANGLE) -R"C++" pp.nw > $@
+-icon.icn: pp.nw icon_translation_table
+- $(TANGLE) -R"Icon" pp.nw > $@
+-oot.icn: pp.nw oot_translation_table
+- $(TANGLE) -R"OOT" pp.nw > $@
+-math.icn: pp.nw math_translation_table
+- $(TANGLE) -R"Mathematica" pp.nw > $@
++C.icn: pp.nw C_translation_table
++ $(TANGLE) -R"C" $< > $@
++C++.icn: pp.nw C++_translation_table
++ $(TANGLE) -R"C++" $< > $@
++icon.icn: pp.nw icon_translation_table
++ $(TANGLE) -R"Icon" $< > $@
++oot.icn: pp.nw oot_translation_table
++ $(TANGLE) -R"OOT" $< > $@
++math.icn: pp.nw math_translation_table
++ $(TANGLE) -R"Mathematica" $< > $@
+
+ ootdefs.icn: ootdefs.nw
+ $(TANGLE) $< $(defns) > $@
+@@ -48,14 +48,14 @@
+
+
+ # Executables: filters.
+-%.filter : %.icn
++%.filter: %.icn
+ $(ICONC) -o $@ $<
+
+ # Executables: autodefs.
+ autodefs.oot: ootdefs.icn
+- $(ICONC) -o autodefs.oot ootdefs.icn
++ $(ICONC) -o $@ $<
+ autodefs.math: mathdefs.icn
+- $(ICONC) -o autodefs.math mathdefs.icn
++ $(ICONC) -o $@ $<
+
+
+ # Cleaning: remove all files that can be recreated from noweb sources.
+@@ -69,7 +69,4 @@
+
+ # Also remove the Icon files for the filters.
+ clean:
+- -rm -f $(rem) C.icn C++.icn icon.icn oot.icn math.icn *.filter autodefs.*
+-
+-
+-
++ $(RM) $(rem) C.icn C++.icn icon.icn oot.icn math.icn *.filter autodefs.*
diff --git a/contrib/kostas/Makefile.make b/contrib/kostas/Makefile.make
--- a/contrib/kostas/Makefile.make
+++ b/contrib/kostas/Makefile.make
-@@ -10,8 +10,8 @@
+@@ -1,6 +1,6 @@
+ # Only works with Gnu make.
+
+-LIB=/opt/noweb/lib
++LIB=/dev/null # to be overridden
+ ICONC=icont
+ # This is supposed to be the defns.nw file in the icon directory of the distribution.
+ defns=defns.nw
+@@ -10,36 +10,36 @@
.SUFFIXES: .nw .icn .tex .dvi
@@ -160,35 +304,49 @@ diff --git a/contrib/kostas/Makefile.make b/contrib/kostas/Makefile.make
+all: C.filter C++.filter icon.filter oot.filter math.filter \
+ autodefs.oot autodefs.math
- install:
- mv *.filter $(LIB)
-@@ -22,7 +22,7 @@
- %.tex : %.nw
+-install:
+- mv *.filter $(LIB)
+- mv autodefs.* $(LIB)
++install: all
++ cp *.filter $(DESTDIR)$(LIB)
++ cp autodefs.* $(DESTDIR)$(LIB)
+
+
+ # TeX files.
+-%.tex : %.nw
++%.tex: %.nw
$(WEAVE) $< > $@
pp.tex: pp.nw
- noweave -delay -autodefs icon -filter icon.filter -index pp.nw > pp.tex
+-%.dvi : %.tex
+ noweave -delay -autodefs icon -filter icon.filter -index $< > $@
- %.dvi : %.tex
++%.dvi: %.tex
latex $<
# Don't delete the intermediate .tex file.
-@@ -31,15 +31,15 @@
+-.PRECIOUS : %.tex
++.PRECIOUS: %.tex
+
# Icon files.
- C.icn: pp.nw C_translation_table
+-C.icn: pp.nw C_translation_table
- $(TANGLE) -R"C" pp.nw > $@
-+ $(TANGLE) -R"C" $< > $@
- C++.icn: pp.nw C++_translation_table
+-C++.icn: pp.nw C++_translation_table
- $(TANGLE) -R"C++" pp.nw > $@
-+ $(TANGLE) -R"C++" $< > $@
- icon.icn: pp.nw icon_translation_table
+-icon.icn: pp.nw icon_translation_table
- $(TANGLE) -R"Icon" pp.nw > $@
-+ $(TANGLE) -R"Icon" $< > $@
- oot.icn: pp.nw oot_translation_table
+-oot.icn: pp.nw oot_translation_table
- $(TANGLE) -R"OOT" pp.nw > $@
-math.icn: pp.nw math_translation_table
- $(TANGLE) -R"Mathematica" pp.nw > $@
++C.icn: pp.nw C_translation_table
++ $(TANGLE) -R"C" $< > $@
++C++.icn: pp.nw C++_translation_table
++ $(TANGLE) -R"C++" $< > $@
++icon.icn: pp.nw icon_translation_table
++ $(TANGLE) -R"Icon" $< > $@
++oot.icn: pp.nw oot_translation_table
+ $(TANGLE) -R"OOT" $< > $@
-+math.icn: pp.nw math_translation_table
++math.icn: pp.nw math_translation_table
+ $(TANGLE) -R"Mathematica" $< > $@
ootdefs.icn: ootdefs.nw
@@ -241,20 +399,20 @@ diff --git a/contrib/norman/Makefile b/contrib/norman/Makefile
-source: ; for i in $(DIRS); do (cd $$i; make source); done
-clean: ; for i in $(DIRS); do (cd $$i; make clean); done
+all:
-+ for i in $(DIRS); do ($(MAKE) -C $$i ICONC=$(ICONC) ICONT=$(ICONT) all); done
++ for i in $(DIRS); do $(MAKE) -C $$i ICONC=$(ICONC) ICONT=$(ICONT) $@; done
+install:
-+ for i in $(DIRS); do ($(MAKE) -C $$i LIB=$(LIB) BIN=$(BIN) install); done
++ for i in $(DIRS); do $(MAKE) -C $$i LIB=$(LIB) BIN=$(BIN) $@; done
+source:
-+ for i in $(DIRS); do ($(MAKE) -C $$i source); done
++ for i in $(DIRS); do $(MAKE) -C $$i $@; done
+clean:
-+ for i in $(DIRS); do ($(MAKE) -C $$i clean); done
++ for i in $(DIRS); do $(MAKE) -C $$i $@; done
iconlib: # cheap hack for slackmake
true
diff --git a/contrib/norman/numarkup/Makefile b/contrib/norman/numarkup/Makefile
--- a/contrib/norman/numarkup/Makefile
+++ b/contrib/norman/numarkup/Makefile
-@@ -6,23 +6,25 @@
+@@ -6,32 +6,31 @@
OBJS = main.o pass1.o latex.o input.o scraps.o names.o arena.o global.o
.SUFFIXES: .nw
@@ -271,12 +429,13 @@ diff --git a/contrib/norman/numarkup/Makefile b/contrib/norman/numarkup/Makefile
- make $(TARGET)
+ $(MAKE) $(TARGET)
- install:
- noweb -t numarkup.nw
+-install:
+- noweb -t numarkup.nw
- make $(TARGET)
-+ $(MAKE) $(TARGET)
++install: all
strip $(TARGET)
- cp $(TARGET) $(LIB)
+- cp $(TARGET) $(LIB)
++ cp $(TARGET) $(DESTDIR)$(LIB)
source: main.c pass1.c latex.c input.c scraps.c names.c arena.c global.c
@@ -286,8 +445,9 @@ diff --git a/contrib/norman/numarkup/Makefile b/contrib/norman/numarkup/Makefile
$(OBJS): global.h
-@@ -30,8 +32,7 @@
- $(CC) -o $(TARGET) $(OBJS)
+ $(TARGET): $(OBJS)
+- $(CC) -o $(TARGET) $(OBJS)
++ $(LINK.c) $^ $(LOADLIBES) $(LDLIBS) -o $@
numarkup.html: numarkup.nw
- noweave -filter l2h -html -index numarkup.nw > numarkup.html
@@ -309,6 +469,12 @@ diff --git a/contrib/ydirson/Makefile b/contrib/ydirson/Makefile
# nothing to tangle or weave
all:
+@@ -8,4 +8,4 @@
+ clean:
+
+ install:
+- cp -p $(FILTERS) $(LIB)
++ cp -p $(FILTERS) $(DESTDIR)$(LIB)
diff --git a/examples/Makefile b/examples/Makefile
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -322,13 +488,13 @@ diff --git a/examples/Makefile b/examples/Makefile
-.nw.m3: ; $(NOTANGLE) -L'<* LINE %L "%F" *>%N' $*.nw > $*.m3
-.tex.dvi: ; latex '\scrollmode \input '"$*"; while grep -s 'Rerun to get cross-references right' $*.log; do latex '\scrollmode \input '"$*"; done
+.nw.html:
-+ $(NOWEAVE) -filter l2h -filter btdefn -index -html $*.nw > $*.html
++ $(NOWEAVE) -filter l2h -filter btdefn -index -html $< > $@
+.nw.tex:
-+ $(NOWEAVE) -index -filter btdefn $*.nw > $*.tex
++ $(NOWEAVE) -index -filter btdefn $< > $@
+.nw.i3:
-+ $(NOTANGLE) -Rinterface -L'<* LINE %L "%F" *>%N' $*.nw > $*.i3
++ $(NOTANGLE) -Rinterface -L'<* LINE %L "%F" *>%N' $< > $@
+.nw.m3:
-+ $(NOTANGLE) -L'<* LINE %L "%F" *>%N' $*.nw > $*.m3
++ $(NOTANGLE) -L'<* LINE %L "%F" *>%N' $< > $@
+.tex.dvi:
+ latex '\scrollmode \input '"$*"; while grep -s 'Rerun to get cross-references right' $*.log; do latex '\scrollmode \input '"$*"; done
@@ -405,13 +571,13 @@ diff --git a/examples/Makefile.awk b/examples/Makefile.awk
-.nw.m3: ; $(NOTANGLE) -L'<* LINE %L "%F" *>%N' $*.nw > $*.m3
-.tex.dvi: ; latex '\scrollmode \input '"$*"; while grep -s 'Rerun to get cross-references right' $*.log; do latex '\scrollmode \input '"$*"; done
+.nw.html:
-+ $(NOWEAVE) -filter btdefn -index -html $*.nw > $*.html
++ $(NOWEAVE) -filter btdefn -index -html $< > $@
+.nw.tex:
-+ $(NOWEAVE) -index -filter btdefn $*.nw > $*.tex
++ $(NOWEAVE) -index -filter btdefn $< > $@
+.nw.i3:
-+ $(NOTANGLE) -Rinterface -L'<* LINE %L "%F" *>%N' $*.nw > $*.i3
++ $(NOTANGLE) -Rinterface -L'<* LINE %L "%F" *>%N' $< > $@
+.nw.m3:
-+ $(NOTANGLE) -L'<* LINE %L "%F" *>%N' $*.nw > $*.m3
++ $(NOTANGLE) -L'<* LINE %L "%F" *>%N' $< > $@
+.tex.dvi:
+ latex '\scrollmode \input '"$*"; while grep -s 'Rerun to get cross-references right' $*.log; do latex '\scrollmode \input '"$*"; done
@@ -478,7 +644,21 @@ diff --git a/examples/Makefile.awk b/examples/Makefile.awk
diff --git a/src/Makefile b/src/Makefile
--- a/src/Makefile
+++ b/src/Makefile
-@@ -27,7 +27,7 @@
+@@ -18,16 +18,17 @@
+ # MAN7EXT is the extension for the nowebstyle man page (usually 7)
+ # TEXINPUTS is the directory for TeX macro files
+ # ELISP is the directory for emacs lisp files, or /dev/null not to install
+-BIN=/usr/local/noweb
+-LIB=/usr/local/noweb/lib
+-MAN=/usr/local/noweb/man
++PREFIX=/usr/local
++BIN=$(PREFIX)/bin
++LIB=$(PREFIX)/libexec/noweb
++MAN=$(PREFIX)/share/man
+ MANEXT=1
+ MAN7EXT=7
+-TEXINPUTS=/usr/local/tex/inputs
++TEXINPUTS=$(PREFIX)/tex/inputs
ELISP=/dev/null
# change WEAVE if you want a different version of noweave to be installed
@@ -487,7 +667,7 @@ diff --git a/src/Makefile b/src/Makefile
# Stop editing. No user-serviceable parts below.
SHELL=/bin/sh
-@@ -37,183 +37,181 @@
+@@ -37,186 +38,183 @@
MAN7DIR=$(MAN)/man$(MAN7EXT)
CATDIR=$(MAN)/cat$(MANEXT)
CAT7DIR=$(MAN)/cat$(MAN7EXT)
@@ -499,9 +679,9 @@ diff --git a/src/Makefile b/src/Makefile
- for i in shell lib xdoc tex; do (cd $$i; make all); done
- cd $(LIBSRC); make "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
+all:
-+ $(MAKE) -C c "CC=$(CC)" "CFLAGS=$(CFLAGS)" all
-+ for i in shell lib xdoc tex; do ($(MAKE) -C $$i all); done
-+ $(MAKE) -C $(LIBSRC) "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
++ $(MAKE) -C c "CC=$(CC)" "CFLAGS=$(CFLAGS)" $@
++ for i in shell lib xdoc tex; do $(MAKE) -C $$i $@; done
++ $(MAKE) -C $(LIBSRC) "ICONT=$(ICONT)" "ICONC=$(ICONC)" $@
FAQ: FAQ.html
- sleep 1; html2ascii FAQ.html > FAQ
@@ -517,11 +697,11 @@ diff --git a/src/Makefile b/src/Makefile
install: install-code install-man install-tex install-elisp
uninstall: uninstall-code uninstall-man uninstall-tex uninstall-elisp
-- -rmdir $(BIN) $(LIB) 2>/dev/null
-+ -rmdir $(DESTDIR)$(BIN) $(DESTDIR)$(LIB) 2>/dev/null
+- -rmdir $(BIN) $(LIB) 2>/dev/null || true
++ -rmdir $(DESTDIR)$(BIN) $(DESTDIR)$(LIB) 2>/dev/null || true
install-shell:
-- -mkdir $(BIN) $(LIB) 2>/dev/null
+- mkdir -p $(BIN) $(LIB)
- sed "s@|LIBDIR|@$(LIBNAME)@" shell/noweb > $(BIN)/noweb
- chmod +x $(BIN)/noweb
- sed "s@|LIBDIR|@$(LIBNAME)@" shell/notangle > $(BIN)/notangle
@@ -582,7 +762,7 @@ diff --git a/src/Makefile b/src/Makefile
- rm -f $(BIN)/htmltoc
- rm -f $(BIN)/noroff
- rm -f $(LIB)/toroff
-- rm $(LIB)/tmac.w
+- rm -f $(LIB)/tmac.w
+ $(RM) $(DESTDIR)$(BIN)/noweb
+ $(RM) $(DESTDIR)$(BIN)/notangle
+ $(RM) $(DESTDIR)$(BIN)/$(WEAVE)
@@ -597,25 +777,25 @@ diff --git a/src/Makefile b/src/Makefile
+ $(RM) $(DESTDIR)$(LIB)/tmac.w
install-code: install-shell
-- -mkdir $(BIN) $(LIB) 2>/dev/null
+- mkdir -p $(BIN) $(LIB)
+ mkdir -p $(DESTDIR)$(BIN) $(DESTDIR)$(LIB)
- strip c/nt c/markup c/mnt c/finduses
-- cp c/nt c/markup c/mnt c/finduses $(LIB)
+ strip c/nt c/markup c/mnt c/finduses c/nwmktemp
+- cp c/nt c/markup c/mnt c/finduses c/nwmktemp $(LIB)
- cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
- cd lib; make LIB=$(LIB) install
-+ cp c/nt c/markup c/mnt c/finduses $(DESTDIR)$(LIB)
-+ $(MAKE) -C $(LIBSRC) DESTDIR=$(DESTDIR) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
-+ $(MAKE) -C lib DESTDIR=$(DESTDIR) LIB=$(LIB) install
++ cp c/nt c/markup c/mnt c/finduses c/nwmktemp $(DESTDIR)$(LIB)
++ $(MAKE) -C $(LIBSRC) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
++ $(MAKE) -C lib LIB=$(LIB) install
uninstall-code: uninstall-shell
-- rm $(LIB)/nt $(LIB)/markup $(LIB)/mnt $(LIB)/finduses
+- rm -f $(LIB)/nt $(LIB)/markup $(LIB)/mnt $(LIB)/finduses
- cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
- cd lib; make LIB=$(LIB) uninstall
-+ $(RM) $(DESTDIR)$(LIB)/nt $(DESTDIR)$(LIB)/markup $(DESTDIR)$(LIB)/mnt $(DESTDIR)$(LIB)/finduses
-+ $(MAKE) -C $(LIBSRC) DESTDIR=$(DESTDIR) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
-+ $(MAKE) -C lib DESTDIR=$(DESTDIR) LIB=$(LIB) uninstall
++ $(RM) $(DESTDIR)$(LIB)/nt $(DESTDIR)$(LIB)/markup $(DESTDIR)$(LIB)/mnt $(DESTDIR)$(LIB)/finduses $(DESTDIR)$(LIB)/nwmktemp
++ $(MAKE) -C $(LIBSRC) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
++ $(MAKE) -C lib LIB=$(LIB) uninstall
install-man:
-- -mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
+- mkdir -p $(MAN) $(MANDIR) $(MAN7DIR)
- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 > $(MANDIR)/cpif.$(MANEXT)
- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.1 > $(MANDIR)/nodefs.$(MANEXT)
- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.1 > $(MANDIR)/noroots.$(MANEXT)
@@ -664,6 +844,7 @@ diff --git a/src/Makefile b/src/Makefile
- rm -f $(MAN7DIR)/nowebfilters.$(MAN7EXT)
- rm -f $(MANDIR)/noweave.$(MANEXT)
- rm -f $(MANDIR)/nountangle.$(MANEXT)
+- -rmdir $(MANDIR) $(MAN7DIR) $(MAN) 2>/dev/null || true
+ $(RM) $(DESTDIR)$(MANDIR)/cpif.$(MANEXT)
+ $(RM) $(DESTDIR)$(MANDIR)/nodefs.$(MANEXT)
+ $(RM) $(DESTDIR)$(MANDIR)/noroots.$(MANEXT)
@@ -678,8 +859,9 @@ diff --git a/src/Makefile b/src/Makefile
+ $(RM) $(DESTDIR)$(MAN7DIR)/nowebfilters.$(MAN7EXT)
+ $(RM) $(DESTDIR)$(MANDIR)/noweave.$(MANEXT)
+ $(RM) $(DESTDIR)$(MANDIR)/nountangle.$(MANEXT)
++ -rmdir $(DESTDIR)$(MANDIR) $(DESTDIR)$(MAN7DIR) $(DESTDIR)$(MAN) 2>/dev/null || true
install-gzipped-man:
-- -mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
+- mkdir -p $(MAN) $(MANDIR) $(MAN7DIR)
- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 | gzip -9 > $(MANDIR)/cpif.$(MANEXT).gz
- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.1 | gzip -9 > $(MANDIR)/nodefs.$(MANEXT).gz
- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.1 | gzip -9 > $(MANDIR)/noroots.$(MANEXT).gz
@@ -715,7 +897,7 @@ diff --git a/src/Makefile b/src/Makefile
+ (cd $(DESTDIR)$(MANDIR) && ln -s notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)
install-preformat-man:
-echo "Warning: install-preformat-man is obsolete, even on Slackware systems" 1>&2
-- -mkdir $(MAN) $(CATDIR) $(CAT7DIR) 2>/dev/null
+- mkdir -p $(MAN) $(CATDIR) $(CAT7DIR)
- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.txt | gzip > $(CATDIR)/cpif.$(MANEXT).gz
- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.txt | gzip > $(CATDIR)/nodefs.$(MANEXT).gz
- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.txt | gzip > $(CATDIR)/noroots.$(MANEXT).gz
@@ -750,51 +932,55 @@ diff --git a/src/Makefile b/src/Makefile
+ $(RM) $(DESTDIR)$(CATDIR)/nountangle.$(MANEXT).gz
+ (cd $(DESTDIR)$(CATDIR) && ln -s notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)
install-tex:
-- -mkdir $(TEXINPUTS) 2>/dev/null
+- mkdir -p $(TEXINPUTS)
- cp tex/nwmac.tex tex/noweb.sty $(TEXINPUTS)
+ mkdir -p $(DESTDIR)$(TEXINPUTS)
+ cp tex/nwmac.tex tex/noweb.sty $(DESTDIR)$(TEXINPUTS)
-texhash || echo "Program texhash not found or failed"
uninstall-tex:
-- rm -f $(TEXINPUTS)/nwmac.tex $(TEXINPUTS)/noweb.sty
-+ $(RM) $(DESTDIR)$(TEXINPUTS)/nwmac.tex $(DESTDIR)$(TEXINPUTS)/noweb.sty
+- rm -f $(TEXINPUTS)/nwmac.tex $(TEXINPUTS)/noweb.sty || true
++ $(RM) $(DESTDIR)$(TEXINPUTS)/nwmac.tex $(DESTDIR)$(TEXINPUTS)/noweb.sty || true
install-elisp:
-- -mkdir $(ELISP) 2>/dev/null
+- if [ "/dev/null" != "$(ELISP)" ]; then mkdir -p $(ELISP); fi
- cp elisp/noweb-mode.el $(ELISP)
-+ mkdir -p $(DESTDIR)$(ELISP)
-+ cp elisp/noweb-mode.el $(DESTDIR)$(ELISP)
++ if [ "/dev/null" != "$(ELISP)" ]; then mkdir -p $(DESTDIR)$(ELISP) && cp elisp/noweb-mode.el $(DESTDIR)$(ELISP); fi
uninstall-elisp:
-- rm -f $(ELISP)/noweb-mode.el
-+ $(RM) $(DESTDIR)$(ELISP)/noweb-mode.el
+- rm -f $(ELISP)/noweb-mode.el || true
++ if [ "/dev/null" != "$(ELISP)" ]; then $(RM) $(DESTDIR)$(ELISP)/noweb-mode.el; fi
checkin:
- for i in lib tex xdoc; do (cd $$i; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
-+ for i in lib tex xdoc; do ($(MAKE) -C $$i "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
- for i in c icon awk; do (cd $$i; ci -l $(CINAME) $(CIMSG) *.nw Makefile); done
- (cd elisp; ci -l $(CINAME) $(CIMSG) *.el)
+- for i in c icon awk; do (cd $$i; ci -l $(CINAME) $(CIMSG) *.nw Makefile); done
+- (cd elisp; ci -l $(CINAME) $(CIMSG) *.el)
++ for i in lib tex xdoc; do $(MAKE) -C $$i "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" $@; done
++ for i in c icon awk; do (cd $$i && ci -l $(CINAME) $(CIMSG) *.nw Makefile); done
++ (cd elisp && ci -l $(CINAME) $(CIMSG) *.el)
ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw
source: FAQ
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make CPIF=">" source); done
-+ for i in c shell lib xdoc icon awk tex; do ($(MAKE) -C $$i CPIF=">" source); done
++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i CPIF=">" $@; done
sleep 1
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
-+ for i in c shell lib xdoc icon awk tex; do ($(MAKE) -C $$i touch); done
++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i touch; done
touch:
touch FAQ
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
-+ for i in c shell lib xdoc icon awk tex; do ($(MAKE) -C $$i touch); done
++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i $@; done
+ boot:
+- for i in c shell lib xdoc icon awk tex; do (cd $$i; make boot); done
++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i $@; done
clean:
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make clean); done
- rm -f nwsrcfilter *~ */*~
-+ for i in c shell lib xdoc icon awk tex; do ($(MAKE) -C $$i clean); done
++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i $@; done
+ $(RM) nwsrcfilter *~ */*~
clobber: clean
-- for i in c lib icon awk xdoc; do (cd $$i; make clobber); done
-+ for i in c lib icon awk xdoc; do ($(MAKE) -C $$i clobber); done
+- for i in c shell lib xdoc icon awk tex; do (cd $$i; make clobber); done
++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i $@; done
Makefile: Makefile.nw
- chmod +w Makefile
@@ -807,7 +993,21 @@ diff --git a/src/Makefile b/src/Makefile
diff --git a/src/Makefile.nw b/src/Makefile.nw
--- a/src/Makefile.nw
+++ b/src/Makefile.nw
-@@ -32,7 +32,7 @@
+@@ -23,16 +23,17 @@
+ # MAN7EXT is the extension for the nowebstyle man page (usually 7)
+ # TEXINPUTS is the directory for TeX macro files
+ # ELISP is the directory for emacs lisp files, or /dev/null not to install
+-BIN=/usr/local/noweb
+-LIB=/usr/local/noweb/lib
+-MAN=/usr/local/noweb/man
++PREFIX=/usr/local
++BIN=$(PREFIX)/bin
++LIB=$(PREFIX)/libexec/noweb
++MAN=$(PREFIX)/share/man
+ MANEXT=1
+ MAN7EXT=7
+-TEXINPUTS=/usr/local/tex/inputs
++TEXINPUTS=$(PREFIX)/tex/inputs
ELISP=/dev/null
# change WEAVE if you want a different version of noweave to be installed
@@ -816,7 +1016,7 @@ diff --git a/src/Makefile.nw b/src/Makefile.nw
# Stop editing. No user-serviceable parts below.
SHELL=/bin/sh
-@@ -42,46 +42,44 @@
+@@ -42,46 +43,44 @@
MAN7DIR=$(MAN)/man$(MAN7EXT)
CATDIR=$(MAN)/cat$(MANEXT)
CAT7DIR=$(MAN)/cat$(MAN7EXT)
@@ -828,9 +1028,9 @@ diff --git a/src/Makefile.nw b/src/Makefile.nw
- for i in shell lib xdoc tex; do (cd $$i; make all); done
- cd $(LIBSRC); make "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
+all:
-+ $(MAKE) -C c "CC=$(CC)" "CFLAGS=$(CFLAGS)" all
-+ for i in shell lib xdoc tex; do ($(MAKE) -C $$i all); done
-+ $(MAKE) -C $(LIBSRC) "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
++ $(MAKE) -C c "CC=$(CC)" "CFLAGS=$(CFLAGS)" $@
++ for i in shell lib xdoc tex; do $(MAKE) -C $$i $@; done
++ $(MAKE) -C $(LIBSRC) "ICONT=$(ICONT)" "ICONC=$(ICONC)" $@
FAQ: FAQ.html
- sleep 1; html2ascii FAQ.html > FAQ
@@ -846,11 +1046,11 @@ diff --git a/src/Makefile.nw b/src/Makefile.nw
install: install-code install-man install-tex install-elisp
uninstall: uninstall-code uninstall-man uninstall-tex uninstall-elisp
-- -rmdir $(BIN) $(LIB) 2>/dev/null
-+ -rmdir $(DESTDIR)$(BIN) $(DESTDIR)$(LIB) 2>/dev/null
+- -rmdir $(BIN) $(LIB) 2>/dev/null || true
++ -rmdir $(DESTDIR)$(BIN) $(DESTDIR)$(LIB) 2>/dev/null || true
install-shell:
-- -mkdir $(BIN) $(LIB) 2>/dev/null
+- mkdir -p $(BIN) $(LIB)
+ mkdir -p $(DESTDIR)$(BIN) $(DESTDIR)$(LIB)
<<shell binaries>>
- cp shell/tmac.w $(LIB)
@@ -858,31 +1058,31 @@ diff --git a/src/Makefile.nw b/src/Makefile.nw
uninstall-shell:
<<uninstall shell binaries>>
-- rm $(LIB)/tmac.w
+- rm -f $(LIB)/tmac.w
+ $(RM) $(DESTDIR)$(LIB)/tmac.w
install-code: install-shell
-- -mkdir $(BIN) $(LIB) 2>/dev/null
+- mkdir -p $(BIN) $(LIB)
+ mkdir -p $(DESTDIR)$(BIN) $(DESTDIR)$(LIB)
- strip c/nt c/markup c/mnt c/finduses
-- cp c/nt c/markup c/mnt c/finduses $(LIB)
+ strip c/nt c/markup c/mnt c/finduses c/nwmktemp
+- cp c/nt c/markup c/mnt c/finduses c/nwmktemp $(LIB)
- cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
- cd lib; make LIB=$(LIB) install
-+ cp c/nt c/markup c/mnt c/finduses $(DESTDIR)$(LIB)
-+ $(MAKE) -C $(LIBSRC) DESTDIR=$(DESTDIR) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
-+ $(MAKE) -C lib DESTDIR=$(DESTDIR) LIB=$(LIB) install
++ cp c/nt c/markup c/mnt c/finduses c/nwmktemp $(DESTDIR)$(LIB)
++ $(MAKE) -C $(LIBSRC) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
++ $(MAKE) -C lib LIB=$(LIB) install
uninstall-code: uninstall-shell
-- rm $(LIB)/nt $(LIB)/markup $(LIB)/mnt $(LIB)/finduses
+- rm -f $(LIB)/nt $(LIB)/markup $(LIB)/mnt $(LIB)/finduses
- cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
- cd lib; make LIB=$(LIB) uninstall
-+ $(RM) $(DESTDIR)$(LIB)/nt $(DESTDIR)$(LIB)/markup $(DESTDIR)$(LIB)/mnt $(DESTDIR)$(LIB)/finduses
-+ $(MAKE) -C $(LIBSRC) DESTDIR=$(DESTDIR) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
-+ $(MAKE) -C lib DESTDIR=$(DESTDIR) LIB=$(LIB) uninstall
++ $(RM) $(DESTDIR)$(LIB)/nt $(DESTDIR)$(LIB)/markup $(DESTDIR)$(LIB)/mnt $(DESTDIR)$(LIB)/finduses $(DESTDIR)$(LIB)/nwmktemp
++ $(MAKE) -C $(LIBSRC) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
++ $(MAKE) -C lib LIB=$(LIB) uninstall
@ I do the [[<<shell binaries>>]] before [[$(LIBSRC)]] so that the
Icon version of [[htmltoc]], if present, will overwrite the Perl
version.
-@@ -91,36 +89,36 @@
+@@ -91,37 +90,37 @@
noroff
do
echo '@<<shell binaries@>>='
@@ -907,29 +1107,31 @@ diff --git a/src/Makefile.nw b/src/Makefile.nw
done
<<*>>=
install-man:
-- -mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
+- mkdir -p $(MAN) $(MANDIR) $(MAN7DIR)
+ mkdir -p $(DESTDIR)$(MANDIR) $(DESTDIR)$(MAN7DIR)
<<ordinary pages>>
uninstall-man:
<<uninstall ordinary pages>>
+- -rmdir $(MANDIR) $(MAN7DIR) $(MAN) 2>/dev/null || true
-@
++ -rmdir $(DESTDIR)$(MANDIR) $(DESTDIR)$(MAN7DIR) $(DESTDIR)$(MAN) 2>/dev/null || true
+@
Slackware no longer uses preformatted compressed pages, just
compressed pages.
<<*>>=
install-gzipped-man:
-- -mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
+- mkdir -p $(MAN) $(MANDIR) $(MAN7DIR)
+ mkdir -p $(DESTDIR)$(MANDIR) $(DESTDIR)$(MAN7DIR)
<<compressed pages>>
<<*>>=
install-preformat-man:
-echo "Warning: install-preformat-man is obsolete, even on Slackware systems" 1>&2
-- -mkdir $(MAN) $(CATDIR) $(CAT7DIR) 2>/dev/null
+- mkdir -p $(MAN) $(CATDIR) $(CAT7DIR)
+ mkdir -p $(DESTDIR)$(CATDIR) $(DESTDIR)$(CAT7DIR)
<<preformatted compressed pages>>
<<generate chunks>>=
NORMALPAGES="cpif nodefs noroots noweb noindex nuweb2noweb notangle noroff sl2h htmltoc"
-@@ -130,96 +128,96 @@
+@@ -131,98 +130,97 @@
for i in $NORMALPAGES; do
echo '@<<ordinary pages@>>='
@@ -1008,54 +1210,58 @@ diff --git a/src/Makefile.nw b/src/Makefile.nw
done
<<*>>=
install-tex:
-- -mkdir $(TEXINPUTS) 2>/dev/null
+- mkdir -p $(TEXINPUTS)
- cp tex/nwmac.tex tex/noweb.sty $(TEXINPUTS)
+ mkdir -p $(DESTDIR)$(TEXINPUTS)
+ cp tex/nwmac.tex tex/noweb.sty $(DESTDIR)$(TEXINPUTS)
-texhash || echo "Program texhash not found or failed"
uninstall-tex:
-- rm -f $(TEXINPUTS)/nwmac.tex $(TEXINPUTS)/noweb.sty
-+ $(RM) $(DESTDIR)$(TEXINPUTS)/nwmac.tex $(DESTDIR)$(TEXINPUTS)/noweb.sty
+- rm -f $(TEXINPUTS)/nwmac.tex $(TEXINPUTS)/noweb.sty || true
++ $(RM) $(DESTDIR)$(TEXINPUTS)/nwmac.tex $(DESTDIR)$(TEXINPUTS)/noweb.sty || true
install-elisp:
-- -mkdir $(ELISP) 2>/dev/null
+- if [ "/dev/null" != "$(ELISP)" ]; then mkdir -p $(ELISP); fi
- cp elisp/noweb-mode.el $(ELISP)
-+ mkdir -p $(DESTDIR)$(ELISP)
-+ cp elisp/noweb-mode.el $(DESTDIR)$(ELISP)
++ if [ "/dev/null" != "$(ELISP)" ]; then mkdir -p $(DESTDIR)$(ELISP) && cp elisp/noweb-mode.el $(DESTDIR)$(ELISP); fi
uninstall-elisp:
-- rm -f $(ELISP)/noweb-mode.el
+- rm -f $(ELISP)/noweb-mode.el || true
-@
-+ $(RM) $(DESTDIR)$(ELISP)/noweb-mode.el
++ if [ "/dev/null" != "$(ELISP)" ]; then $(RM) $(DESTDIR)$(ELISP)/noweb-mode.el; fi
+@
<<*>>=
checkin:
- for i in lib tex xdoc; do (cd $$i; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
-+ for i in lib tex xdoc; do ($(MAKE) -C $$i "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
- for i in c icon awk; do (cd $$i; ci -l $(CINAME) $(CIMSG) *.nw Makefile); done
- (cd elisp; ci -l $(CINAME) $(CIMSG) *.el)
+- for i in c icon awk; do (cd $$i; ci -l $(CINAME) $(CIMSG) *.nw Makefile); done
+- (cd elisp; ci -l $(CINAME) $(CIMSG) *.el)
++ for i in lib tex xdoc; do $(MAKE) -C $$i "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" $@; done
++ for i in c icon awk; do (cd $$i && ci -l $(CINAME) $(CIMSG) *.nw Makefile); done
++ (cd elisp && ci -l $(CINAME) $(CIMSG) *.el)
ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw
source: FAQ
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make CPIF=">" source); done
-+ for i in c shell lib xdoc icon awk tex; do ($(MAKE) -C $$i CPIF=">" source); done
++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i CPIF=">" $@; done
sleep 1
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
-+ for i in c shell lib xdoc icon awk tex; do ($(MAKE) -C $$i touch); done
++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i touch; done
touch:
touch FAQ
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
-+ for i in c shell lib xdoc icon awk tex; do ($(MAKE) -C $$i touch); done
++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i $@; done
+ boot:
+- for i in c shell lib xdoc icon awk tex; do (cd $$i; make boot); done
++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i $@; done
clean:
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make clean); done
- rm -f nwsrcfilter *~ */*~
-+ for i in c shell lib xdoc icon awk tex; do ($(MAKE) -C $$i clean); done
++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i $@; done
+ $(RM) nwsrcfilter *~ */*~
clobber: clean
-- for i in c lib icon awk xdoc; do (cd $$i; make clobber); done
-+ for i in c lib icon awk xdoc; do ($(MAKE) -C $$i clobber); done
+- for i in c shell lib xdoc icon awk tex; do (cd $$i; make clobber); done
++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i $@; done
Makefile: Makefile.nw
- chmod +w Makefile
@@ -1067,45 +1273,59 @@ diff --git a/src/Makefile.nw b/src/Makefile.nw
diff --git a/src/awk/Makefile b/src/awk/Makefile
--- a/src/awk/Makefile
+++ b/src/awk/Makefile
-@@ -6,33 +6,34 @@
- SHELL=/bin/sh
-
- LIBEXECS=totex noidx tohtml
+@@ -8,11 +8,10 @@
+ LIBEXECSBARE=noidx tohtml
+ LIBEXECSDEP=totex
+ LIBEXECS=$(LIBEXECSBARE) $(LIBEXECSDEP)
-BINEXECS=noindex
+BINEXECS=noindex
EXECS=$(BINEXECS) $(LIBEXECS)
-all: $(EXECS)
+- chmod +x $(EXECS)
+all: $(EXECS)
- chmod +x $(EXECS)
sources: $(EXECS)
touch: $(EXECS)
touch $(EXECS)
+@@ -20,28 +19,33 @@
+ touch $(EXECS)
install: all
-- cp $(LIBEXECS) $(LIB)
+- cp $(LIBEXECSBARE) $(LIB)
+- for i in $(LIBEXECSDEP); do sed "s@|LIBDIR|@$(LIB)@" "$$i" > $(LIB)/"$$i"; chmod +x $(LIB)/$$i; done
- cp $(BINEXECS) $(BIN)
-+ cp $(LIBEXECS) $(DESTDIR)$(LIB)
++ cp $(LIBEXECSBARE) $(DESTDIR)$(LIB)
++ for i in $(LIBEXECSDEP); do sed "s@|LIBDIR|@$(LIB)@" "$$i" > $(DESTDIR)$(LIB)/"$$i"; chmod +x $(DESTDIR)$(LIB)/$$i; done
+ cp $(BINEXECS) $(DESTDIR)$(BIN)
+ uninstall:
+- for i in $(LIBEXECS); do rm -f $(LIB)/$$i; done
+- for i in $(BINEXECS); do rm -f $(BIN)/$$i; done
++ for i in $(LIBEXECS); do $(RM) $(DESTDIR)$(LIB)/$$i; done
++ for i in $(BINEXECS); do $(RM) $(DESTDIR)$(BIN)/$$i; done
+
source: $(EXECS)
totex: totex.nw
- notangle -Rtotex totex.nw > totex
-+ notangle -Rtotex $< > $@
++ notangle -R$@ $< > $@
++ chmod +x $@
noidx: noidx.nw
- notangle noidx.nw > noidx
+ notangle $< > $@
++ chmod +x $@
tohtml: tohtml.nw
- notangle tohtml.nw > tohtml
+ notangle $< > $@
++ chmod +x $@
-noindex: noindex.nw
- notangle -Rnoindex noindex.nw > noindex
+noindex: noindex.nw
-+ notangle -Rnoindex $< > $@
++ notangle -R$@ $< > $@
++ chmod +x $@
-clean: ; rm -f *.log *.blg *.dvi *.toc *.aux *.tex *~ *.html
+clean:
@@ -1116,7 +1336,7 @@ diff --git a/src/awk/Makefile b/src/awk/Makefile
diff --git a/src/c/Makefile b/src/c/Makefile
--- a/src/c/Makefile
+++ b/src/c/Makefile
-@@ -14,15 +14,15 @@
+@@ -14,9 +14,9 @@
main.o errors.o columns.o
MARKUPOBJS=markmain.o strsave.o markup.o errors.o getline.o columns.o
FILES=markmain.nw markup.nw \
@@ -1129,14 +1349,7 @@ diff --git a/src/c/Makefile b/src/c/Makefile
SRCS=columns.h errors.h getline.h markup.h match.h modtrees.h \
modules.h notangle.h recognize.h strsave.h \
- columns.c errors.c getline.c finduses.c main.c markmain.c markup.c match.c \
- mnt.c modtrees.c modules.c notangle.c readme.c recognize.c strsave.c \
-- markup.ps
-+ markup.ps
- NAME='name of RCS version'
-
- NOTANGLE=notangle
-@@ -32,76 +32,76 @@
+@@ -32,81 +32,78 @@
CPIF=>
.SUFFIXES: .nw .tex .dvi .h
@@ -1146,29 +1359,29 @@ diff --git a/src/c/Makefile b/src/c/Makefile
- $(CC) $(CFLAGS) -c $*.c
-.nw.h: ; $(NOTANGLE) -Rheader $*.nw $(CPIF) $*.h
+.nw.tex:
-+ noweave $*.nw >$*.tex
++ noweave $< >$@
+.nw.c:
-+ $(NOTANGLE) -L $*.nw >$*.c
-+.nw.o:
-+ $(NOTANGLE) -L $*.nw >$*.c
-+ $(CC) $(CFLAGS) -c $*.c
++ $(NOTANGLE) -L $< >$@
+.nw.h:
-+ $(NOTANGLE) -Rheader $*.nw $(CPIF) $*.h
++ $(NOTANGLE) -Rheader $< $(CPIF) $@
--all: nt markup mnt finduses
-+all: nt markup mnt finduses
+-all: nt markup mnt finduses nwmktemp
++all: nt markup mnt finduses nwmktemp
-nt: $(TANGLEOBJS)
- $(CC) $(CFLAGS) -o nt $(TANGLEOBJS)
+nt: $(TANGLEOBJS)
+ $(LINK.c) $^ $(LOADLIBES) $(LDLIBS) -o $@
--finduses: $(FINDUSESOBJS)
-- $(CC) $(CFLAGS) -o finduses $(FINDUSESOBJS)
+ nwmktemp: nwmktemp.o
+- $(CC) $(CFLAGS) -o nwmktemp nwmktemp.o
+finduses: $(FINDUSESOBJS)
+markup: $(MARKUPOBJS)
+mnt: $(MNTOBJS)
+-finduses: $(FINDUSESOBJS)
+- $(CC) $(CFLAGS) -o finduses $(FINDUSESOBJS)
+-
-markup: $(MARKUPOBJS)
- $(CC) $(CFLAGS) -o markup $(MARKUPOBJS)
-
@@ -1180,6 +1393,10 @@ diff --git a/src/c/Makefile b/src/c/Makefile
touch: $(SRCS)
touch $(SRCS)
+-boot: ; touch $(SRCS)
++boot:
++ touch $(SRCS)
+
-clean: ; rm -f nt markup mnt finduses fakepretty
- rm -f core *.makelog *.tex *.log *.blg *.dvi *.o *.toc *~
- rm -f *.atac *.trace *.html
@@ -1228,7 +1445,7 @@ diff --git a/src/c/Makefile b/src/c/Makefile
fakepretty: $(FPOBJS)
- $(CC) $(CFLAGS) -o fakepretty $(FPOBJS)
--
+
-columns.o: columns.h
-errors.o: errors.h
-finduses.o: errors.h match.h getline.h recognize.h
@@ -1245,10 +1462,6 @@ diff --git a/src/c/Makefile b/src/c/Makefile
-modtrees.o: strsave.h modules.h modtrees.h errors.h
-modules.o: modules.h modtrees.h errors.h columns.h strsave.h
-notangle.o: strsave.h getline.h modules.h modtrees.h errors.h match.h notangle.h
--pretty.o: getline.h match.h errors.h pretty.h strsave.h
--readme.o:
--recognize.o:
--strsave.o: strsave.h errors.h
+markmain.o: errors.h markup.h getline.h columns.h
+markup.o: markup.h strsave.h errors.h
+match.o: match.h
@@ -1256,14 +1469,17 @@ diff --git a/src/c/Makefile b/src/c/Makefile
+modtrees.o: strsave.h modules.h modtrees.h errors.h
+modules.o: modules.h modtrees.h errors.h columns.h strsave.h
+notangle.o: strsave.h getline.h modules.h modtrees.h errors.h match.h notangle.h
+ nwmktemp.o:
+-pretty.o: getline.h match.h errors.h pretty.h strsave.h
+-recognize.o:
+-strsave.o: strsave.h errors.h
+pretty.o: getline.h match.h errors.h pretty.h strsave.h
-+readme.o:
+recognize.o:
+strsave.o: strsave.h errors.h
diff --git a/src/icon/Makefile b/src/icon/Makefile
--- a/src/icon/Makefile
+++ b/src/icon/Makefile
-@@ -6,13 +6,13 @@
+@@ -6,23 +6,23 @@
CPIF=| cpif # change to ">" to insure all sources always made
LIBEXECS=totex disambiguate noidx tohtml elide l2h docs2comments \
@@ -1272,24 +1488,47 @@ diff --git a/src/icon/Makefile b/src/icon/Makefile
autodefs.promela autodefs.lrtl autodefs.asdl autodefs.mmix xchunks pipedocs
LIBSPECIAL=autodefs.cee
BINEXECS=noindex sl2h htmltoc
- EXECS=$(LIBEXECS) $(BINEXECS) $(LIBSPECIAL)
+ EXECS=$(LIBEXECS) $(BINEXECS) $(LIBSPECIAL) pdcached
SRCS=totex.icn disambiguate.icn noidx.icn texdefs.icn icondefs.icn \
- yaccdefs.icn noindex.icn smldefs.icn tohtml.icn cdefs.icn elide.icn \
+ yaccdefs.icn noindex.icn smldefs.icn tohtml.icn cdefs.icn elide.icn \
l2h.icn sl2h.icn pascaldefs.icn promeladefs.icn lrtldefs.icn asdldefs.icn \
- mmixdefs.icn htmltoc.icn xchunks.icn
-
-@@ -32,112 +32,112 @@
+ mmixdefs.icn htmltoc.icn xchunks.icn docs2comments.icn pipedocs.icn pdcached.icn
+
+ .SUFFIXES: .nw .icn .html .tex .dvi
+ .nw.icn:
+- notangle -L'#line %-1L "%F"%N' $*.nw $(CPIF) $*.icn
++ notangle -L'#line %-1L "%F"%N' $< $(CPIF) $@
+ .nw.html:
+- noweave -filter l2h -autodefs icon -html -index $*.nw | htmltoc > $*.html
++ noweave -filter l2h -autodefs icon -html -index $< | htmltoc > $@
+ .nw.tex:
+- noweave -delay -autodefs icon -index $*.nw > $*.tex
++ noweave -delay -autodefs icon -index $< > $@
+ .tex.dvi:
+ latex $*; while grep -s 'Rerun to get cross' $*.log; do latex $*; done
+
+@@ -34,118 +34,118 @@
+ boot:
touch $(SRCS)
- install: $(EXECS)
+-install: $(EXECS)
- cp $(LIBEXECS) $(LIB)
- cp $(BINEXECS) $(BIN)
- cp $(LIBSPECIAL) $(LIB)/autodefs.c
++install: all
+ cp $(LIBEXECS) $(DESTDIR)$(LIB)
+ cp $(BINEXECS) $(DESTDIR)$(BIN)
+ cp $(LIBSPECIAL) $(DESTDIR)$(LIB)/autodefs.c
+ uninstall:
+- for i in $(LIBEXECS); do rm -f $(LIB)/$$i; done
+- for i in $(BINEXECS); do rm -f $(BIN)/$$i; done
+- rm -f $(LIB)/autodefs.c
++ for i in $(LIBEXECS); do $(RM) $(DESTDIR)$(LIB)/$$i; done
++ for i in $(BINEXECS); do $(RM) $(DESTDIR)$(BIN)/$$i; done
++ $(RM) $(DESTDIR)$(LIB)/autodefs.c
+
clean:
- /bin/rm -f *.tex *.dvi *.aux *.log *.blg *.bbl *~ *.toc *.html *.u1 *.u2
- /bin/rm -f *.[ch] *.ps *.gz
@@ -1397,14 +1636,14 @@ diff --git a/src/icon/Makefile b/src/icon/Makefile
l2h.icn: l2h.nw
- notangle -L'#line %-1L "%F"%N' -R'l2h.icn' l2h.nw $(CPIF) l2h.icn
-+ notangle -L'#line %-1L "%F"%N' -R'l2h.icn' $< $(CPIF) $@
++ notangle -L'#line %-1L "%F"%N' -R$@ $< $(CPIF) $@
l2h: l2h.icn
- $(ICONT) -o l2h l2h.icn # no longer compiles with iconc
+ $(ICONT) -o $@ $< # no longer compiles with iconc
sl2h.icn: l2h.nw
- notangle -L'#line %-1L "%F"%N' -R'sl2h.icn' l2h.nw $(CPIF) sl2h.icn
-+ notangle -L'#line %-1L "%F"%N' -R'sl2h.icn' $< $(CPIF) $@
++ notangle -L'#line %-1L "%F"%N' -R$@ $< $(CPIF) $@
sl2h: sl2h.icn
- $(ICONT) -o sl2h sl2h.icn # no longer compiles with iconc
+ $(ICONT) -o $@ $< # no longer compiles with iconc
@@ -1439,25 +1678,35 @@ diff --git a/src/icon/Makefile b/src/icon/Makefile
diff --git a/src/lib/Makefile b/src/lib/Makefile
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
-@@ -11,9 +11,9 @@
+@@ -11,15 +11,14 @@
chmod +x unmarkup emptydefn toascii nwmtime pipedocs h2a btdefn
install: all
-- cp unmarkup emptydefn toascii nwmtime h2a btdefn $(LIB)
+- cp unmarkup emptydefn nwmtime btdefn $(LIB)
- sed 's@|LIBDIR|@$(LIB)@g' pipedocs > $(LIB)/pipedocs
-- chmod +x $(LIB)/pipedocs
-+ cp unmarkup emptydefn toascii nwmtime h2a btdefn $(DESTDIR)$(LIB)
+- sed 's@|LIBDIR|@$(LIB)@g' toascii > $(LIB)/toascii
+- sed 's@|LIBDIR|@$(LIB)@g' h2a > $(LIB)/h2a
+- chmod +x $(LIB)/pipedocs $(LIB)/toascii $(LIB)/h2a
++ cp unmarkup emptydefn nwmtime btdefn $(DESTDIR)$(LIB)
+ sed 's@|LIBDIR|@$(LIB)@g' pipedocs > $(DESTDIR)$(LIB)/pipedocs
-+ chmod +x $(DESTDIR)$(LIB)/pipedocs
++ sed 's@|LIBDIR|@$(LIB)@g' toascii > $(DESTDIR)$(LIB)/toascii
++ sed 's@|LIBDIR|@$(LIB)@g' h2a > $(DESTDIR)$(LIB)/h2a
++ chmod +x $(DESTDIR)$(LIB)/pipedocs $(DESTDIR)$(LIB)/toascii $(DESTDIR)$(LIB)/h2a
+
+ uninstall:
+- for i in unmarkup emptydefn toascii nwmtime h2a btdefn; do rm -f $(LIB)/$$i; done
+- rm -f $(LIB)/pipedocs
++ for i in unmarkup emptydefn toascii nwmtime pipedocs h2a btdefn; do $(RM) $(DESTDIR)$(LIB)/$$i; done
checkin:
ci -l $(CINAME) $(CIMSG) $(RCSFILES)
-@@ -23,8 +23,9 @@
+@@ -31,8 +30,10 @@
touch toascii
toascii: toascii.nw
- notangle -Rtoascii toascii.nw > toascii
-+ notangle -Rtoascii $< > $@
++ notangle -R$@ $< > $@
++ chmod +x $@
-clean: ; rm -f *.log *.blg *.dvi *.toc *.aux *.tex *~
+clean:
@@ -1468,7 +1717,15 @@ diff --git a/src/lib/Makefile b/src/lib/Makefile
diff --git a/src/shell/Makefile b/src/shell/Makefile
--- a/src/shell/Makefile
+++ b/src/shell/Makefile
-@@ -9,25 +9,27 @@
+@@ -1,7 +1,6 @@
+ # Copyright 1993 by Norman Ramsey. All rights reserved.
+ # See file COPYRIGHT for more information.
+ SHELL=/bin/sh
+-LIB=/usr/public/pkg/noweb/lib
+
+ EXEC=noweave noweb notangle noroff toroff
+ SRCS=$(EXEC) tmac.w
+@@ -9,9 +8,9 @@
CINAME=
CIMSG=
@@ -1478,46 +1735,47 @@ diff --git a/src/shell/Makefile b/src/shell/Makefile
-touch: $(SRCS)
+touch: $(SRCS)
touch $(SRCS)
-
- checkin:
+ boot:
+ touch $(SRCS)
+@@ -20,16 +19,18 @@
ci -l $(CINAME) $(CIMSG) $(RCSFILES)
noweave: noweave.nw
- notangle -Rnoweave noweave.nw > noweave
-+ notangle -Rnoweave $< > $@
++ notangle -R$@ $< > $@
notangle: notangle.nw
- notangle -Rnotangle notangle.nw > notangle
-+ notangle -Rnotangle $< > $@
++ notangle -R$@ $< > $@
-noweb: noweb.nw
- notangle -Rnoweb noweb.nw > noweb
+noweb: noweb.nw
-+ notangle -Rnoweb $< > $@
++ notangle -R$@ $< > $@
noroff toroff tmac.w: roff.nw
- noweb -t roff.nw
+ noweb -t $<
--clean: ; rm -f *.log *.blg *.dvi *.toc *.aux *.tex *~
+-clean: ; rm -f *.log *.blg *.dvi *.toc *.aux *.tex *~ *.nwt roff.mm
-clobber: clean ; rm -f $(SRCS)
+clean:
-+ $(RM) *.log *.blg *.dvi *.toc *.aux *.tex *~
++ $(RM) *.log *.blg *.dvi *.toc *.aux *.tex *~ *.nwt roff.mm
+clobber: clean
+ $(RM) $(SRCS)
diff --git a/src/tex/Makefile b/src/tex/Makefile
--- a/src/tex/Makefile
+++ b/src/tex/Makefile
-@@ -12,14 +12,14 @@
+@@ -14,15 +14,15 @@
ci -l $(CINAME) $(CIMSG) $(RCSFILES)
nwmac.tex: support.nw
- notangle -Rnwmac.tex support.nw > nwmac.tex
-+ notangle -Rnwmac.tex $< > $@
++ notangle -R$@ $< > $@
noweb.sty: support.nw
- notangle -Rnoweb.sty support.nw > noweb.sty
-+ notangle -Rnoweb.sty $< > $@
++ notangle -R$@ $< > $@
support.tex: support.nw
- noweave -delay -x support.nw > support.tex
@@ -1529,6 +1787,7 @@ diff --git a/src/tex/Makefile b/src/tex/Makefile
+clean:
+ $(RM) *~ *.dvi *.aux *.log *.blg *.bbl *.toc
+ $(RM) support.tex
+ clobber: clean
diff --git a/src/xdoc/Makefile b/src/xdoc/Makefile
--- a/src/xdoc/Makefile
+++ b/src/xdoc/Makefile
@@ -1541,13 +1800,13 @@ diff --git a/src/xdoc/Makefile b/src/xdoc/Makefile
-.7.txt: ; nroff -man $*.7 > $*.txt
-.7.ps: ; psroff -t -man $*.7 > $*.ps
+.1.txt:
-+ nroff -man $*.1 > $*.txt
++ nroff -man $< > $@
+.1.ps:
-+ psroff -t -man $*.1 > $*.ps
++ psroff -t -man $< > $@
+.7.txt:
-+ nroff -man $*.7 > $*.txt
++ nroff -man $< > $@
+.7.ps:
-+ psroff -t -man $*.7 > $*.ps
++ psroff -t -man $< > $@
MANPAGES=notangle.1 cpif.1 noweb.1 nodefs.1 noroots.1 noindex.1 \
- nowebstyle.7 nowebfilters.7 nuweb2noweb.1 sl2h.1 htmltoc.1 \
@@ -1559,7 +1818,7 @@ diff --git a/src/xdoc/Makefile b/src/xdoc/Makefile
noroff.txt
SRCS=$(MANPAGES) $(TXTPAGES)
-@@ -30,52 +34,52 @@
+@@ -32,52 +36,52 @@
ci -l $(CINAME) $(CIMSG) $(RCSFILES)
$(WWW)/onepage.ps: onepage.ps
@@ -1576,11 +1835,11 @@ diff --git a/src/xdoc/Makefile b/src/xdoc/Makefile
notangle.1: manpage.nw ../shell/noweave.nw docdate.nw
- notangle -t8 -Rnotangle.1 manpage.nw ../shell/noweave.nw docdate.nw | $(DOVERSION) > notangle.1
-+ notangle -t8 -Rnotangle.1 $^ | $(DOVERSION) > $@
++ notangle -t8 -R$@ $^ | $(DOVERSION) > $@
nowebstyle.7: manpage.nw ../tex/support.nw docdate.nw
- notangle -t8 -Rnowebstyle.7 manpage.nw ../tex/support.nw docdate.nw | $(DOVERSION) > nowebstyle.7
-+ notangle -t8 -Rnowebstyle.7 $^ | $(DOVERSION) > $@
++ notangle -t8 -R$@ $^ | $(DOVERSION) > $@
nowebfilters.7: nowebfilters.nw docdate.nw
- notangle -t8 nowebfilters.nw docdate.nw | $(DOVERSION) > nowebfilters.7
@@ -1588,7 +1847,7 @@ diff --git a/src/xdoc/Makefile b/src/xdoc/Makefile
noweb.1: manpage.nw docdate.nw
- notangle -t8 -Rnoweb.1 manpage.nw docdate.nw | $(DOVERSION) > noweb.1
-+ notangle -t8 -Rnoweb.1 $^ | $(DOVERSION) > $@
++ notangle -t8 -R$@ $^ | $(DOVERSION) > $@
nodefs.1: nodefs.nw docdate.nw
- notangle -t8 nodefs.nw docdate.nw | $(DOVERSION) > nodefs.1
@@ -1612,11 +1871,11 @@ diff --git a/src/xdoc/Makefile b/src/xdoc/Makefile
cpif.1: manpage.nw docdate.nw
- notangle -t8 -Rcpif.1 manpage.nw docdate.nw | $(DOVERSION) > cpif.1
-+ notangle -t8 -Rcpif.1 $^ | $(DOVERSION) > $@
++ notangle -t8 -R$@ $^ | $(DOVERSION) > $@
nuweb2noweb.1: manpage.nw docdate.nw
- notangle -t8 -Rnuweb2noweb.1 manpage.nw docdate.nw | $(DOVERSION) > nuweb2noweb.1
-+ notangle -t8 -Rnuweb2noweb.1 $^ | $(DOVERSION) > $@
++ notangle -t8 -R$@ $^ | $(DOVERSION) > $@
noroff.1: noroff.nw docdate.nw
- notangle -t8 noroff.nw docdate.nw | $(DOVERSION) > noroff.1
@@ -1628,7 +1887,7 @@ diff --git a/src/xdoc/Makefile b/src/xdoc/Makefile
techrep.dvi: techrep.tex wc.tex
latex '\scrollmode \input '"techrep"
-@@ -86,23 +90,23 @@
+@@ -88,23 +92,23 @@
while grep -s 'Rerun to get cross-references right' onepage.log; do latex '\scrollmode \input '"onepage"; done
onepage.ps: onepage.dvi
@@ -1644,8 +1903,9 @@ diff --git a/src/xdoc/Makefile b/src/xdoc/Makefile
+ dvips -P cmz -o $@ guide
guide.uu: guide.ps
- gzip < guide.ps > guide.ps.gz
+- gzip < guide.ps > guide.ps.gz
- uuencode guide.ps.gz < guide.ps.gz > guide.uu
++ gzip < $< > guide.ps.gz
+ uuencode guide.ps.gz < guide.ps.gz > $@
guide.html: guide.dvi
diff --git a/development/noweb/patches/toascii.diff b/development/noweb/patches/toascii.diff
new file mode 100644
index 0000000000..a6f7fd2e81
--- /dev/null
+++ b/development/noweb/patches/toascii.diff
@@ -0,0 +1,143 @@
+diff --git a/src/.gitignore b/src/.gitignore
+--- a/src/.gitignore
++++ b/src/.gitignore
+@@ -1,3 +1,2 @@
+ /texhash
+ /solmake
+-/lib/toascii
+diff --git a/src/lib/toascii b/src/lib/toascii
+new file mode 100755
+--- /dev/null
++++ b/src/lib/toascii
+@@ -0,0 +1,131 @@
++#!/bin/sh
++delay=0 noindex=0
++for i do
++ case $i in
++ -delay) delay=1 ;;
++ -noindex) noindex=1 ;;
++ *) echo "This can't happen -- $i passed to toascii" 1>&2 ; exit 1 ;;
++ esac
++done
++awkfile=$(mktemp)
++textfile=$(mktemp)
++tagsfile=$(mktemp)
++export awkfile textfile tagsfile
++trap 'rm -f $awkfile $textfile $tagsfile' 0 1 2 10 14 15
++nawk 'BEGIN { textfile=ENVIRON["textfile"]
++ tagsfile=ENVIRON["tagsfile"] }
++ /^@begin code/ { ++secno }
++ /^@xref label/ { print $3, secno >tagsfile }
++ /^@((begin|end) (docs|code))/ { print >textfile }
++ /^@(text|nl|defn|use)/ { print >textfile }
++ /^@xref (ref|notused)/ { print >textfile }
++ /^@xref (begin|end)(defs|uses)/ { print >textfile }
++ /^@xref (def|use)item/ { print >textfile}
++ /^@xref ((begin|end)chunks)|(chunk(begin|use|defn|end))/ { print >textfile }
++ /^@index (begin|end)(defs|uses)/ { print >textfile }
++ /^@index (is(us|defin)ed)|((def|use)item)/ { print >textfile }
++ /^@index ((begin|end)index)|(entry(begin|use|defn|end))/ { print >textfile }'
++nawk 'BEGIN {
++ textfile = ENVIRON["textfile"]
++ tagsfile = ENVIRON["tagsfile"]
++ tfmt="detex | fmt -79"
++ cfmt="expand -4 | fold -75 | sed \"s/^/ /\""
++ xfmt="fold -75 | sed \"s/^/ /\""
++ zfmt="cat"
++ while (getline <tagsfile > 0)
++ tag[$1] = $2
++ close(tagsfile)
++ }
++ /^@begin docs/ { out = tfmt }
++ /^@end docs/ { close(out) }
++ /^@begin code/ { out = cfmt; code = 1; ++secno }
++ /^@end code/ { endcode(); close(out); printf "\n" }
++ /^@text/ { printf "%s", substr($0, 7) | out }
++ /^@nl/ { # printf "(->%s)", formatname(out) | out ;
++ printf "\n" | out }
++ /^@xref ref/ { lastxrefref = tag[substr($0, 11)] }
++ /^@defn/ { name = convquote(substr($0, 7))
++ printf "\n### %d ### %s%s=",
++ secno, chunkname(name, lastxrefref), defn[name]
++ defn[name] = "+" }
++ /^@use/ { name = convquote(substr($0, 6))
++ printf "%s", chunkname(name, lastxrefref) | out }
++ /^@xref begindefs/ { endcode()
++ printf "This definition continued in" | out }
++ /^@xref beginuses/ { endcode()
++ printf "This code used in" | out }
++ /^@xref notused/ { endcode()
++ print "This code not used in this document." | out }
++ /^@xref (def|use)item/ { addlist(tag[$3]) }
++ /^@xref end(defs|uses)/ { printlist() }
++ $0 ~ /^@index begindefs/ && !noindex {
++ endcode()
++ print "Defines:" | out }
++
++ $0 ~ /^@index isused/ && !noindex {
++ if (tag[$3] != lastxrefref) addlist(tag[$3]) }
++
++ $0 ~ /^@index defitem/ && !noindex {
++ printf " %s,", $3 | out
++ if (nlist == 0) printf " not used in this document.\n" | out
++ else { printf " used in" | out; printlist() } }
++ $0 ~ /^@index beginuses/ && !noindex { endcode(); printf "Uses" | out }
++ $0 ~ /^@index isdefined/ && !noindex { lastuse = tag[$3] }
++ $0 ~ /^@index useitem/ && !noindex { addlist(sprintf("%s %s", $3, lastuse)) }
++ $0 ~ /^@index enduses/ && !noindex { printlist() }
++ /^@xref beginchunks/ { close(out); out = zfmt
++ print "List of code chunks\n" | out }
++ /^@xref chunkbegin/ { name = convquote(substr($0, length($3) + 19))
++ printf "%s\n", chunkname(name, tag[$3]) | out }
++ /^@xref chunkuse/ { addlist(tag[$3]) }
++ /^@xref chunkdefn/ { }
++ /^@xref chunkend/ { if (nlist == 0)
++ print " Not used in this document." | out
++ else { printf " Used in" | out; printlist() } }
++ /^@xref endchunks/ { }
++ $0 ~ /^@index beginindex/ && !noindex { print "\nList of identifiers (defini" \
++ "tion in parentheses)\n" | out }
++ $0 ~ /^@index entrybegin/ && !noindex { name = substr($0, length($3 + 19))
++ lastdefn = tag[$3]
++ printf "%s: ", $4 | out }
++ $0 ~ /^@index entryuse/ && !noindex { addlist(tag[$3]) }
++ $0 ~ /^@index entrydefn/ && !noindex { }
++ $0 ~ /^@index entryend/ && !noindex { for (i = 1; i <= nlist; i++)
++ if (list[i] == lastdefn)
++ sub(/.*/, "(&)", list[i])
++ if (nlist == 0)
++ print "Not used." | out
++ else printlist() }
++ $0 ~ /^@index endindex/ && !noindex { }
++ /^@fatal / { exit 1 }
++ END {
++ close(out)
++ }
++ function endcode() {
++ if (code == 1) {
++ code = 0
++ close(out)
++ out = xfmt
++ printf "\n" | out } }
++ function addlist(s, i) {
++ for (i = 1; i <= nlist; i++)
++ if (s == list[i]) return
++ list[++nlist] = s }
++
++ function printlist( i) {
++ if (nlist == 1) printf " %s.\n", list[1] | out
++ else if (nlist == 2) printf " %s and %s.\n", list[1], list[2] | out
++ else {
++ for (i = 1; i < nlist; i++)
++ printf " %s,", list[i] | out
++ printf " and %s.\n", list[nlist] | out }
++ for (i in list) delete list[i]
++ nlist = 0 }
++ function convquote(s) { gsub(/\[\[|\]\]/, "", s); return s }
++ function chunkname(name, number) {
++ if (number == 0)
++ return sprintf("<%s>", name)
++ else
++ return sprintf("<%s %d>", name, number)
++ }' noindex=$noindex $textfile
++exit $?
diff --git a/development/numpy3/numpy3.SlackBuild b/development/numpy3/numpy3.SlackBuild
index 53f0a6b141..e8fb0b3cda 100644
--- a/development/numpy3/numpy3.SlackBuild
+++ b/development/numpy3/numpy3.SlackBuild
@@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=numpy3
SRCNAM=numpy
-VERSION=${VERSION:-1.20.3}
+VERSION=${VERSION:-1.21.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/numpy3/numpy3.info b/development/numpy3/numpy3.info
index ff41befb4b..68954a383f 100644
--- a/development/numpy3/numpy3.info
+++ b/development/numpy3/numpy3.info
@@ -1,8 +1,8 @@
PRGNAM="numpy3"
-VERSION="1.20.3"
+VERSION="1.21.2"
HOMEPAGE="https://www.numpy.org/"
-DOWNLOAD="https://github.com/numpy/numpy/releases/download/v1.20.3/numpy-1.20.3.tar.gz"
-MD5SUM="802ddf90c7e226ba56ed0ea244f8b53d"
+DOWNLOAD="https://github.com/numpy/numpy/releases/download/v1.21.2/numpy-1.21.2.tar.gz"
+MD5SUM="55c11984b0a0ae28baa118052983f355"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/obcpl/README b/development/obcpl/README
index f3248d3c85..4a9996cef2 100644
--- a/development/obcpl/README
+++ b/development/obcpl/README
@@ -12,3 +12,20 @@ deal to recommend it. The compiler frontend consists of only about
x86_64 note: obcpl doesn't require multilib on Slackware64. It only
generates 32-bit x86 code, but the binaries it creates are 100%
statically linked, and will run fine on Slackware64 without multlib.
+
+The package includes:
+
+- The BCPL compiler itself (/usr/bin/obcpl and the support files in
+ /usr/lib(64)?/obcpl)
+- The utilities:
+ - obcpl-cmpltest: compiler test
+ - obcpl-gpm: macro generator
+ - obcpl-xref: cross referencer
+- The sources for the utilities
+- Example code (Hello World and a factorial calculator)
+- The obcpl documentation, including manual.txt and standard.txt
+
+See also:
+
+https://en.wikipedia.org/wiki/BCPL
+https://www.cl.cam.ac.uk/~mr10/bcplman.pdf
diff --git a/development/obcpl/examples/Makefile b/development/obcpl/examples/Makefile
new file mode 100644
index 0000000000..dbac82c919
--- /dev/null
+++ b/development/obcpl/examples/Makefile
@@ -0,0 +1,17 @@
+# Makefile for obcpl/util
+
+BC=obcpl
+BFLAGS=-O
+
+all: hello factorial
+
+hello: hello.b
+ $(BC) $(BFLAGS) hello.b
+
+factorial: factorial.b
+ $(BC) $(BFLAGS) factorial.b
+
+install:
+
+clean:
+ rm -f hello factorial *.o
diff --git a/development/obcpl/examples/README b/development/obcpl/examples/README
new file mode 100644
index 0000000000..14eb1dcccc
--- /dev/null
+++ b/development/obcpl/examples/README
@@ -0,0 +1,14 @@
+README for SlackBuilds.org development/obcpl examples
+-----------------------------------------------------
+
+This directory contains simple example programs written in BCPL.
+
+hello.b: The canonical Hello World program.
+Original source: https://github.com/leachim6/hello-world/
+
+factorial.b: Calculates the factorials of the integers 1 through 5.
+Original source: https://en.wikipedia.org/wiki/BCPL
+
+If you want to mess with this directory, it's best to copy it to your
+user's home directory (so you don't have to compile the programs as
+root). You can compile hello and factorial just by running "make".
diff --git a/development/obcpl/examples/factorial.b b/development/obcpl/examples/factorial.b
new file mode 100644
index 0000000000..c6ea911cc3
--- /dev/null
+++ b/development/obcpl/examples/factorial.b
@@ -0,0 +1,9 @@
+GET "LIBHDR"
+
+LET START() = VALOF $(
+ FOR I = 1 TO 5 DO
+ WRITEF("%N! = %I4*N", I, FACT(I))
+ RESULTIS 0
+$)
+
+AND FACT(N) = N = 0 -> 1, N * FACT(N - 1)
diff --git a/development/obcpl/examples/hello.b b/development/obcpl/examples/hello.b
new file mode 100644
index 0000000000..976f70a6e6
--- /dev/null
+++ b/development/obcpl/examples/hello.b
@@ -0,0 +1,6 @@
+GET "LIBHDR"
+
+LET START() BE
+$(
+ WRITES("Hello World*N")
+$)
diff --git a/development/obcpl/fix_segfault.diff b/development/obcpl/fix_segfault.diff
new file mode 100644
index 0000000000..707afa27a1
--- /dev/null
+++ b/development/obcpl/fix_segfault.diff
@@ -0,0 +1,12 @@
+diff -Naur obcpl-0.9.8/src/cg.c obcpl-0.9.8.patcged/src/cg.c
+--- obcpl-0.9.8/src/cg.c 2013-03-25 17:41:43.000000000 -0400
++++ obcpl-0.9.8.patcged/src/cg.c 2021-09-06 04:43:29.444894247 -0400
+@@ -374,7 +374,7 @@
+ emit(".equ G%d,%s", x, label(rdn()));
+ }
+ }
+- return;
++ break;
+ case S_FINISH:
+ emit("jmp finish");
+ break;
diff --git a/development/obcpl/obcpl.SlackBuild b/development/obcpl/obcpl.SlackBuild
index ba45ea1535..dcf86a8460 100644
--- a/development/obcpl/obcpl.SlackBuild
+++ b/development/obcpl/obcpl.SlackBuild
@@ -6,11 +6,17 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210906 bkw: BUILD=2
+# - fix build on -current
+# - add missing docs to docdir
+# - compile and install the stuff from util/*.b
+# - add some example code
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=obcpl
VERSION=${VERSION:-0.9.8}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +28,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
@@ -60,6 +63,11 @@ 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 {} \+
+# Fix a return-without-value from a non-void function. This warning
+# was there all along, but in 14.2 it didn't seem to cause a
+# problem. Now it makes the 'cg' binary segfault. So:
+patch -p1 < $CWD/fix_segfault.diff
+
cd src
ln -s sys_linux.s sys.s
@@ -73,7 +81,7 @@ make CFLAGS="$SLKCFLAGS" PREFIX="/usr"
# Not quite ready to install: the PREFIX override doesn't entirely work
# because the st binary was built from st.O (obcpl's parsed syntax tree
# format) which has the /usr/local/lib path baked into it (not affected
-# by the sed command, above). It's distributed this way because obcpl
+# by the sed command, above). st.O is distributed this way because obcpl
# needs to be buildable on a system without an existing BCPL compiler. So
# we need to regenerate st.O from st.b (its BCPL source), then rebuild
# st from st.O. This works because st will look for its includes in the
@@ -88,16 +96,39 @@ make st
# Now we're good to go.
make PREFIX="$PKG/usr" install
-cd -
-
gzip $PKG/usr/man/man1/$PRGNAM.1
# Use a symlink instead of a hard link here:
rm -f $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/libhdr
ln -s LIBHDR $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/libhdr
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/*.txt util $PKG/usr/doc/$PRGNAM-$VERSION
+# 20210906 bkw: build utils too. have to use a custom obcpl wrapper
+# that runs the uninstalled binaries and make sure LIBHDR can be found
+# in the current dir (see above). Install them with obcpl- prefix
+# because 'gpm' is a conflict with Slackware's gpm, and 'xref' is
+# a pretty generic name (can't guarantee there's no other xref command
+# on SBo).
+
+cd ../util
+sed "/^d=/s,=.*,=../src," < ../src/obcpl > ./obcpl
+ln -s ../src/LIBHDR .
+chmod +x ./obcpl
+make BC=./obcpl
+mkdir -p $PKG/usr/bin
+for i in cmpltest xref gpm; do
+ install -s -m0755 $i $PKG/usr/bin/obcpl-$i
+done
+make clean # so the util/ in the docdir will be just the source
+rm -f ./obcpl
+cd ..
+
+# util/ is included as example code. Also our own examples/ dir.
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
+cp -a C* README doc/*.txt util $PKG/usr/doc/$PRGNAM-$VERSION
+for i in $CWD/examples/*; do
+ cat $i > $PKG/usr/doc/$PRGNAM-$VERSION/examples/$( basename $i )
+done
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/opencomal/opencomal.SlackBuild b/development/opencomal/opencomal.SlackBuild
index ad34c8ce0d..1cc4d47448 100644
--- a/development/opencomal/opencomal.SlackBuild
+++ b/development/opencomal/opencomal.SlackBuild
@@ -29,9 +29,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
diff --git a/development/pcc/README b/development/pcc/README
index 121124f12c..eae8f47b89 100644
--- a/development/pcc/README
+++ b/development/pcc/README
@@ -1,21 +1,30 @@
-pcc (Portable C Compiler) is based on the original Portable C Compiler
-by S. C. Johnson, written in the late 70's. About 50% of the frontend
-code and 80% of the backend code has been rewritten.
+pcc (Portable C Compiler)
+
+pcc is based on the original Portable C Compiler by S. C. Johnson,
+written in the late 1970s. About 50% of the frontend code and 80% of
+the backend code has been rewritten.
Build options (environment variables):
+
TLS - Enable thread local storage? Default=no, export TLS=yes to enable.
-CC - Compiler to use. Default: look for pcc, gcc, clang (in that order).
+CC - Compiler to use. Default: look for pcc and clang (in that order).
+ It's no longer possible to use CC=gcc.
+
+Notes:
+
+1. To bootstrap pcc, first remove any old versions of pcc
+ (and pcc-libs, if present), then build and install pcc twice
+ (without setting CC). The first time, pcc will be built with
+ clang. The second time, it will be built with itself.
-This build is for the 1.1.0 release of pcc. The 1.0 release no longer
-works on modern Slackware versions (newer than 13.37). The old pcc
-1.0 had separate builds for pcc and pcc-libs; this build includes the
-libraries so no separate pcc-libs is needed (or exists).
+2. This build is for a post-1.1.0 snapshot of pcc. The 1.0 release no
+ longer works on modern Slackware versions (newer than 13.37), and
+ the 1.1.0 release no longer works on Slackware 15.0. The old pcc
+ 1.0 had separate builds for pcc and pcc-libs; this build includes
+ the libraries so no separate pcc-libs is needed (or exists).
-Optional step: To bootstrap pcc, first remove any old versions of pcc
-(and pcc-libs, if present), then build and install pcc twice (without
-setting CC). The first time, pcc will be built with gcc. The second
-time, it will be built with itself.
+3. pcc is a C compiler only. There is experimental, incomplete
+ support for C++ and Fortran 77 in the pcc codebase, but neither is
+ usable yet.
-Note: pcc is a C compiler only. There is experimental, incomplete
-support for C++ and Fortran 77 in the pcc codebase, but neither is
-usable yet.
+See also: http://pcc.ludd.ltu.se/ftp/pub/pcc-docs/
diff --git a/development/pcc/pcc.SlackBuild b/development/pcc/pcc.SlackBuild
index 1db36fee9d..21c9e37700 100644
--- a/development/pcc/pcc.SlackBuild
+++ b/development/pcc/pcc.SlackBuild
@@ -2,10 +2,20 @@
# Slackware build script for pcc (Portable C Compiler)
-# Originally written by Armin Besirovic <armin[at]linux[dot]org[dot]ba>
-
+# Originally written by Armin Besirovic <email removed>
# Modified by B. Watson <yalhcru@gmail.com>
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20210906 bkw:
+# - updated for 1.2.0.DEVEL+20210905. Putting the .DEVEL in VERSION
+# is a bit unsightly, but it matches the output of "pcc --version"
+# and also Debian's version numbering scheme.
+# - compiling with gcc no longer works, use clang or pcc. actually,
+# compiling with gcc gives us a pcc that seems to compile stuff OK,
+# but anything compiled with that pcc will segfault on startup.
+# - add WTPL (since there was no license at all).
+
# 20141031 bkw:
# - took over maintentance.
# - upgraded for 1.1.0 beta series.
@@ -25,10 +35,18 @@
# - upgraded for pcc-1.1.0 release, no more beta
# - add seddery to fix typo in cc.c (ifdef => ifndef)
+# Note to self: when updating to a new CVS snapshot, first download
+# the latest: http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-current.tgz Then
+# look at the file DATESTAMP inside that tarball, and use that date's
+# snapshot. This is because the CVS snap tarballs are generated
+# nightly, whether or not there actually were any code changes,
+# and we want VERSION to be the date of the last actual code change.
+# For pcc-libs, just use the same snapshot date as pcc.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=pcc
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-1.2.0.DEVEL+20210905}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -41,9 +59,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
@@ -53,6 +68,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
+TARVER=${VERSION/*+}
+
# non-standard stanza here: we're not going to use -march= or -mtune=
# on 32-bit Slackware, because doing so prevents pcc from being used
# to compile itself. I could add logic to use those flags only if
@@ -71,15 +88,23 @@ if [ "$CC" = "" ]; then
# user didn't specify, autodetect.
if pcc --version &>/dev/null; then
CC=pcc
- elif gcc --version &>/dev/null; then
- CC=gcc
elif clang --version &>/dev/null; then
CC=clang
+ SLKCFLAGS+=" -fcommon"
else
- echo "Can't find any of pcc, gcc, or clang in \$PATH. Giving up." 1>&2
+ echo "Can't find pcc or clang in \$PATH. Giving up." 1>&2
fi
fi
+# let the user shoot himself in the foot if he insists, but at least
+# warn him how much it's going to hurt.
+if [ "$CC" = "gcc" ]; then
+ echo
+ echo "!!! CC is gcc, this will produce a non-working pcc. You asked for it..."
+ echo
+ sleep 3
+fi
+
export CC
WITHCC="$( basename $CC )"
[ "$CC" = "pcc" ] && WITHCC="pcc itself"
@@ -93,23 +118,16 @@ fi
rm -rf $PKG $TMP/$PRGNAM
mkdir -p $TMP/$PRGNAM $PKG $OUTPUT
cd $TMP/$PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-tar xvf $CWD/$PRGNAM-libs-$VERSION.tgz
+tar xvf $CWD/$PRGNAM-$TARVER.tgz
+tar xvf $CWD/$PRGNAM-libs-$TARVER.tgz
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# first, the compiler itself:
-cd $PRGNAM-$VERSION
-
-# fix typo, ref http://marc.info/?l=pcc-list&m=141824411830017&w=2
-sed -i '0,/^#ifdef MULTI/!s,^#ifdef \(MULTI\),#ifndef \1,' cc/cc/cc.c
+cd $PRGNAM-$TARVER
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
./configure \
$TLSOPT \
--prefix=/usr \
@@ -136,7 +154,7 @@ sed -n '/Copyright/,/^ *$/s,^...,,p' cc/cc/cc.c \
# now, build the libs. we don't attempt to build them with the just-built
# pcc (maybe possible, but not worth the effort).
-cd $TMP/$PRGNAM/$PRGNAM-libs-$VERSION
+cd $TMP/$PRGNAM/$PRGNAM-libs-$TARVER
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/development/pcc/pcc.info b/development/pcc/pcc.info
index 9bd158fca7..4d1449ffbd 100644
--- a/development/pcc/pcc.info
+++ b/development/pcc/pcc.info
@@ -1,10 +1,10 @@
PRGNAM="pcc"
-VERSION="1.1.0"
+VERSION="1.2.0.DEVEL+20210905"
HOMEPAGE="http://pcc.ludd.ltu.se/"
-DOWNLOAD="http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/pcc-1.1.0.tgz \
- http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/pcc-libs-1.1.0.tgz"
-MD5SUM="1c0f22440753075d64f9f2c6ed0e8278 \
- 360c157bbf6a7a931c4760ccf4ad704a"
+DOWNLOAD="http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-20210905.tgz \
+ http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/pcc-libs-20210905.tgz"
+MD5SUM="6c724a95251c4cffdebc5ae0c3d975ee \
+ a8d1ed9033b72cb3279b483c83c99582"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/pcc/slack-desc b/development/pcc/slack-desc
index a04f018fea..f105427ffe 100644
--- a/development/pcc/slack-desc
+++ b/development/pcc/slack-desc
@@ -9,7 +9,7 @@
pcc: pcc (Portable C Compiler)
pcc:
pcc: The compiler is based on the original Portable C Compiler by S. C.
-pcc: Johnson, written in the late 70's. About 50% of the frontend code
+pcc: Johnson, written in the late 1970s. About 50% of the frontend code
pcc: and 80% of the backend code has been rewritten. See the PCC History
pcc: wiki page for details.
pcc:
diff --git a/development/xdebug/README b/development/php-xdebug/README
index 8f44e093f7..8f44e093f7 100644
--- a/development/xdebug/README
+++ b/development/php-xdebug/README
diff --git a/development/xdebug/doinst.sh b/development/php-xdebug/doinst.sh
index d41438b853..d41438b853 100644
--- a/development/xdebug/doinst.sh
+++ b/development/php-xdebug/doinst.sh
diff --git a/development/xdebug/xdebug.SlackBuild b/development/php-xdebug/php-xdebug.SlackBuild
index aeaae735ca..1c44fd6271 100644
--- a/development/xdebug/xdebug.SlackBuild
+++ b/development/php-xdebug/php-xdebug.SlackBuild
@@ -3,28 +3,30 @@
# Slackware build script for xdebug
# Copyright (c) 2010, Antonio Hernández Blas <hba.nihilismus@gmail.com>
-# Copyright 2011-2018 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2011-2021 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 1.- Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# 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=xdebug
+SRCNAM=xdebug
+PRGNAM=php-$SRCNAM
VERSION=${VERSION:-3.0.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -50,8 +52,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,10 +71,10 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
rm -f package.xml
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tgz
+cd $SRCNAM-$VERSION
chown -R root:root .
find -L . \
diff --git a/development/xdebug/xdebug.info b/development/php-xdebug/php-xdebug.info
index 63f17437fe..28c477647b 100644
--- a/development/xdebug/xdebug.info
+++ b/development/php-xdebug/php-xdebug.info
@@ -1,4 +1,4 @@
-PRGNAM="xdebug"
+PRGNAM="php-xdebug"
VERSION="3.0.4"
HOMEPAGE="http://xdebug.org"
DOWNLOAD="https://xdebug.org/files/xdebug-3.0.4.tgz"
diff --git a/development/php-xdebug/slack-desc b/development/php-xdebug/slack-desc
new file mode 100644
index 0000000000..a31cb5b845
--- /dev/null
+++ b/development/php-xdebug/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+php-xdebug: php-xdebug (A PHP extension for debugging PHP scripts)
+php-xdebug:
+php-xdebug: The Xdebug extension helps you debugging your script by providing a
+php-xdebug: lot of valuable debug information. The debug information that Xdebug
+php-xdebug: can provide includes the following: stack traces and function traces
+php-xdebug: in error messages, memory allocation and protection for infinite
+php-xdebug: recursions. Xdebug also provides profiling information for PHP,
+php-xdebug: scripts, code coverage analysis and capabilities to debug PHP scripts
+php-xdebug: interactively with a debug client.
+php-xdebug:
+php-xdebug: Homepage: https://xdebug.org/
diff --git a/development/php-xdebug/xdebug.ini b/development/php-xdebug/xdebug.ini
new file mode 100644
index 0000000000..ab5797b912
--- /dev/null
+++ b/development/php-xdebug/xdebug.ini
@@ -0,0 +1,2 @@
+; Enable xdebug extension module
+;zend_extension = "/usr/LIBDIR/php/extensions/xdebug.so"
diff --git a/development/pkgdiff/pkgdiff.SlackBuild b/development/pkgdiff/pkgdiff.SlackBuild
index 4bd66b19ec..13bd0b7c4e 100644
--- a/development/pkgdiff/pkgdiff.SlackBuild
+++ b/development/pkgdiff/pkgdiff.SlackBuild
@@ -20,9 +20,6 @@ TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# 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
@@ -41,11 +38,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
DESTDIR=$PKG make install
diff --git a/development/portaudio/portaudio.SlackBuild b/development/portaudio/portaudio.SlackBuild
index 6cbe607180..90683f96b3 100644
--- a/development/portaudio/portaudio.SlackBuild
+++ b/development/portaudio/portaudio.SlackBuild
@@ -28,15 +28,15 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=portaudio
-SRCNAM=pa
-VERSION=${VERSION:-v190700_20210406}
+
+VERSION=${VERSION:-19.7.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -54,8 +54,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -73,9 +73,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/${SRCNAM}_stable_${VERSION}.tgz
-cd $PRGNAM
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/development/portaudio/portaudio.info b/development/portaudio/portaudio.info
index f378047f00..ed40e6ae3c 100644
--- a/development/portaudio/portaudio.info
+++ b/development/portaudio/portaudio.info
@@ -1,8 +1,8 @@
PRGNAM="portaudio"
-VERSION="v190700_20210406"
-HOMEPAGE="http://www.portaudio.com/"
-DOWNLOAD="http://files.portaudio.com/archives/pa_stable_v190700_20210406.tgz"
-MD5SUM="ad319249932c6794b551d954b8844402"
+VERSION="19.7.0"
+HOMEPAGE="https://github.com/portaudio/portaudio/"
+DOWNLOAD="https://github.com/PortAudio/portaudio/archive/v19.7.0/portaudio-19.7.0.tar.gz"
+MD5SUM="49ecd6de2350b3a1466116538f7be0e7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/portaudio/slack-desc b/development/portaudio/slack-desc
index d7fed55855..1a6f0f8548 100644
--- a/development/portaudio/slack-desc
+++ b/development/portaudio/slack-desc
@@ -14,6 +14,6 @@ portaudio: interface. Example programs are included that play sine waves,
portaudio: process audio input (guitar fuzz), record and playback audio, list
portaudio: available audio devices, etc.
portaudio:
-portaudio: Homepage: http://portaudio.com/
+portaudio: Homepage: https://github.com/portaudio/portaudio/
portaudio:
portaudio:
diff --git a/development/postman/postman.SlackBuild b/development/postman/postman.SlackBuild
index a58810eb44..b8c0f4a156 100644
--- a/development/postman/postman.SlackBuild
+++ b/development/postman/postman.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=postman
SRCDIR=Postman
SRCNAM=linux
-VERSION=${VERSION:-8.8.0}
+VERSION=${VERSION:-8.12.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/postman/postman.info b/development/postman/postman.info
index 0d3ba0c87c..963f5774e2 100644
--- a/development/postman/postman.info
+++ b/development/postman/postman.info
@@ -1,10 +1,10 @@
PRGNAM="postman"
-VERSION="8.8.0"
+VERSION="8.12.4"
HOMEPAGE="https://www.getpostman.com"
-DOWNLOAD="https://dl.pstmn.io/download/version/8.8.0/linux64"
-MD5SUM="fd67bf0aa740f674eb85961741632091"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://dl.pstmn.io/download/version/8.12.4/linux64"
+MD5SUM_x86_64="29d282ba3901bd66ace3ec072e23c8b9"
REQUIRES=""
MAINTAINER="Ebben Aries"
EMAIL="slackbuilds@dscp.org"
diff --git a/development/pycharm/pycharm.SlackBuild b/development/pycharm/pycharm.SlackBuild
index ca4b2c1965..357ebd0f4c 100644
--- a/development/pycharm/pycharm.SlackBuild
+++ b/development/pycharm/pycharm.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for pycharm
-# Copyright 2015-2020 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2015-2021 Dimitris Zlatanidis Orestiada, Greece
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=pycharm
EDITION=community
-VERSION=${VERSION:-2020.3.1}
+VERSION=${VERSION:-2021.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/pycharm/pycharm.info b/development/pycharm/pycharm.info
index b08a1d5088..c6655a1cfa 100644
--- a/development/pycharm/pycharm.info
+++ b/development/pycharm/pycharm.info
@@ -1,8 +1,8 @@
PRGNAM="pycharm"
-VERSION="2020.3.1"
+VERSION="2021.2"
HOMEPAGE="https://www.jetbrains.com/pycharm/"
-DOWNLOAD="https://download.jetbrains.com/python/pycharm-community-2020.3.1.tar.gz"
-MD5SUM="f48850dcca98636f0b9352c33d5666f4"
+DOWNLOAD="https://download.jetbrains.com/python/pycharm-community-2021.2.tar.gz"
+MD5SUM="ec8298f2f2eeb4deea35000006b83535"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/python3-matplotlib/python3-matplotlib.SlackBuild b/development/python3-matplotlib/python3-matplotlib.SlackBuild
index 0659b373ae..829d1caa30 100644
--- a/development/python3-matplotlib/python3-matplotlib.SlackBuild
+++ b/development/python3-matplotlib/python3-matplotlib.SlackBuild
@@ -28,19 +28,19 @@
# Updated to 0.99.1.2 by João Felipe Santos <joao.eel@gmail.com>
# Patch for libpng borrowed from Arch Linux (no longer needed, 2019.01.31, S.U.)
# Adapted for Python 3 by Jeremy Hansen
-# Updated up to version 2.2.3 by Serban Udrea <S.Udrea@gsi.de>
+# Updated up to version 3.4.3 by Serban Udrea <S.Udrea@gsi.de>
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=python3-matplotlib
SRCNAM=matplotlib
-VERSION=${VERSION:-2.2.3}
+VERSION=${VERSION:-3.4.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
-TARBALL_VERSION=${TARBALL_VERSION:-2.2.3} # Tarball may have wrong versioning
+TARBALL_VERSION=${TARBALL_VERSION:-3.4.3} # Tarball may have wrong versioning
ENABLE_TESTS=${ENABLE_TESTS:-N}
if [ -z "$ARCH" ]; then
@@ -90,7 +90,7 @@ fi
# Use modified setupext.py to make sure that the build process gets
# interrupted if requirements are not fulfilled
#
-cat "${CWD}/setupext.py" > setupext.py
+#cat "${CWD}/setupext.py" > setupext.py
python3 setup.py install --root $PKG # > ${CWD}/SETUP.OUTPUT 2>&1
diff --git a/development/python3-matplotlib/python3-matplotlib.info b/development/python3-matplotlib/python3-matplotlib.info
index 8317a44714..02632071c8 100644
--- a/development/python3-matplotlib/python3-matplotlib.info
+++ b/development/python3-matplotlib/python3-matplotlib.info
@@ -1,8 +1,8 @@
PRGNAM="python3-matplotlib"
-VERSION="2.2.3"
+VERSION="3.4.3"
HOMEPAGE="https://matplotlib.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/eb/a0/31b6ba00bc4dcbc06f0b80d1ad6119a9cc3081ecb04a00117f6c1ca3a084/matplotlib-2.2.3.tar.gz"
-MD5SUM="403b0bddd751d71187416f20d4cff100"
+DOWNLOAD="https://files.pythonhosted.org/packages/21/37/197e68df384ff694f78d687a49ad39f96c67b8d75718bc61503e1676b617/matplotlib-3.4.3.tar.gz"
+MD5SUM="6858958370a26cccfa81abc7b6dd3622"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="numpy3 python3-dateutil pytz python3-cycler python3-kiwisolver python3-tornado"
diff --git a/development/reflex/reflex.SlackBuild b/development/reflex/reflex.SlackBuild
index 83f588469a..50141811ac 100644
--- a/development/reflex/reflex.SlackBuild
+++ b/development/reflex/reflex.SlackBuild
@@ -9,7 +9,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=reflex
-VERSION=${VERSION:-2.5.4.20200715}
+VERSION=${VERSION:-2.5.4.20210808}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +22,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
diff --git a/development/reflex/reflex.info b/development/reflex/reflex.info
index 44a1d828f7..3df9be1a13 100644
--- a/development/reflex/reflex.info
+++ b/development/reflex/reflex.info
@@ -1,8 +1,8 @@
PRGNAM="reflex"
-VERSION="2.5.4.20200715"
-HOMEPAGE="http://invisible-island.net/reflex/reflex.html"
-DOWNLOAD="ftp://ftp.invisible-island.net/reflex/reflex-20200715.tgz"
-MD5SUM="864494e63fa8dec456fd5b55eb749ed4"
+VERSION="2.5.4.20210808"
+HOMEPAGE="https://invisible-island.net/reflex/reflex.html"
+DOWNLOAD="https://invisible-mirror.net/archives/reflex/reflex-20210808.tgz"
+MD5SUM="31ed4340e8b636cb2c1de2ad378a14e9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/rmac/rmac.SlackBuild b/development/rmac/rmac.SlackBuild
index b8370ce1c7..3f757d16a3 100644
--- a/development/rmac/rmac.SlackBuild
+++ b/development/rmac/rmac.SlackBuild
@@ -8,13 +8,14 @@
# Upstream doesn't do source release tarballs, see git2targz.sh.
+# 20210907 bkw: update for v2.1.12_20210820.
# 20180922 bkw:
# - updated for v1.13.5_20180603, had to add -j1 to make command.
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=rmac
-VERSION=${VERSION:-1.13.5_20180603}
+VERSION=${VERSION:-2.1.12_20210820}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -27,9 +28,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
diff --git a/development/rmac/rmac.info b/development/rmac/rmac.info
index 2ad2328bd2..2d8a8c2b2f 100644
--- a/development/rmac/rmac.info
+++ b/development/rmac/rmac.info
@@ -1,9 +1,9 @@
PRGNAM="rmac"
-VERSION="1.13.5_20180603"
-HOMEPAGE="http://atariage.com/forums/topic/264842-rmac-the-grandchild-of-madmac-assembler-finally-gets-6502-support/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/rmac-1.13.5_20180603.tar.xz \
+VERSION="2.1.12_20210820"
+HOMEPAGE="https://atariage.com/forums/topic/264842-rmac-the-grandchild-of-madmac-assembler-finally-gets-6502-support/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/rmac-2.1.12_20210820.tar.xz \
https://slackware.uk/~urchlay/src/madmac-examples.tar.xz"
-MD5SUM="b42fb292daf2f20147bead7dc9fe607d \
+MD5SUM="3648b145a9641abcbe57ba0bb6c554b3 \
3d6dff2b72815935c322c91277ea5074"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/development/robotframework/robotframework.SlackBuild b/development/robotframework/robotframework.SlackBuild
index 8c0f71072e..9b4859b6c9 100644
--- a/development/robotframework/robotframework.SlackBuild
+++ b/development/robotframework/robotframework.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=robotframework
-VERSION=${VERSION:-4.1}
+VERSION=${VERSION:-4.1.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/robotframework/robotframework.info b/development/robotframework/robotframework.info
index a3ccfd3f9a..7eb58c77cc 100644
--- a/development/robotframework/robotframework.info
+++ b/development/robotframework/robotframework.info
@@ -1,8 +1,8 @@
PRGNAM="robotframework"
-VERSION="4.1"
+VERSION="4.1.2"
HOMEPAGE="https://robotframework.org/"
-DOWNLOAD="https://github.com/robotframework/robotframework/archive/v4.1/robotframework-4.1.tar.gz"
-MD5SUM="ad4c017b57020bd10d0a758b21383b14"
+DOWNLOAD="https://github.com/robotframework/robotframework/archive/v4.1.2/robotframework-4.1.2.tar.gz"
+MD5SUM="5d7a16dc742b697a71b31df7aff4e4fa"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/sbcl/sbcl.SlackBuild b/development/sbcl/sbcl.SlackBuild
index 7d33f83c32..830a3f329f 100644
--- a/development/sbcl/sbcl.SlackBuild
+++ b/development/sbcl/sbcl.SlackBuild
@@ -27,7 +27,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=sbcl
-VERSION=${VERSION:-2.1.3}
+VERSION=${VERSION:-2.1.7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/sbcl/sbcl.info b/development/sbcl/sbcl.info
index 13978ef814..f66accf030 100644
--- a/development/sbcl/sbcl.info
+++ b/development/sbcl/sbcl.info
@@ -1,8 +1,8 @@
PRGNAM="sbcl"
-VERSION="2.1.3"
+VERSION="2.1.7"
HOMEPAGE="http://www.sbcl.org/"
-DOWNLOAD="http://downloads.sourceforge.net/sbcl/sbcl-2.1.3-source.tar.bz2"
-MD5SUM="f96e5a4e48e3812cf78fb2559b0fd088"
+DOWNLOAD="http://downloads.sourceforge.net/sbcl/sbcl-2.1.7-source.tar.bz2"
+MD5SUM="3f21dbcab14b4aa51b9a9f03c2b78b9c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/sloccount/sloccount.SlackBuild b/development/sloccount/sloccount.SlackBuild
index 747172eb8b..56e45d1e80 100644
--- a/development/sloccount/sloccount.SlackBuild
+++ b/development/sloccount/sloccount.SlackBuild
@@ -1,9 +1,29 @@
#!/bin/bash
# Slackware build script for SLOCcount
-# Written by Aleksandar B. Samardzic <asamardzic@math.rs>
+
+# Copyright 2010-2021 Heinz Wiesinger, Amsterdam, The Netherlands
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Originally written by Aleksandar B. Samardzic <asamardzic@math.rs>
# Modified by the SlackBuilds.org project
-# Updated for Slackware 13.0 by Heinz Wiesinger <pprkut@liwjatan.at>
cd $(dirname $0) ; CWD=$(pwd)
diff --git a/development/sloccount/sloccount.info b/development/sloccount/sloccount.info
index aafad94f49..a4c9f3c48d 100644
--- a/development/sloccount/sloccount.info
+++ b/development/sloccount/sloccount.info
@@ -1,7 +1,7 @@
PRGNAM="sloccount"
VERSION="2.26"
-HOMEPAGE="https://www.dwheeler.com/sloccount/"
-DOWNLOAD="https://www.dwheeler.com/sloccount/sloccount-2.26.tar.gz"
+HOMEPAGE="https://dwheeler.com/sloccount/"
+DOWNLOAD="https://dwheeler.com/sloccount/sloccount-2.26.tar.gz"
MD5SUM="09abd6e2a016ebaf7552068a1dba1249"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/development/source-highlight/gcc11.patch b/development/source-highlight/gcc11.patch
new file mode 100644
index 0000000000..1e5b0dd8df
--- /dev/null
+++ b/development/source-highlight/gcc11.patch
@@ -0,0 +1,34 @@
+From 904949c9026cb772dc93fbe0947a252ef47127f4 Mon Sep 17 00:00:00 2001
+From: Tom Tromey <tom@tromey.com>
+Date: Wed, 10 Jun 2020 20:38:27 -0600
+Subject: Remove "throw" specifications
+
+diff --git a/lib/srchilite/fileutil.cc b/lib/srchilite/fileutil.cc
+index 59a6d64..963178c 100644
+--- a/lib/srchilite/fileutil.cc
++++ b/lib/srchilite/fileutil.cc
+@@ -48,7 +48,7 @@ void set_file_util_verbose(bool b) {
+ // FIXME avoid using a global variable
+ std::string start_path;
+
+-string readFile(const string &fileName) throw (IOException) {
++string readFile(const string &fileName) {
+ ifstream file(fileName.c_str());
+
+ if (!file.is_open()) {
+diff --git a/lib/srchilite/fileutil.h b/lib/srchilite/fileutil.h
+index 7335a9b..042eb56 100644
+--- a/lib/srchilite/fileutil.h
++++ b/lib/srchilite/fileutil.h
+@@ -27,7 +27,7 @@ extern std::string start_path;
+ * @return the contents of the file
+ * @throw IOException
+ */
+-string readFile(const string &fileName) throw (IOException);
++string readFile(const string &fileName);
+
+ //char *read_file(const string &fileName);
+
+--
+cgit v1.2.1
+
diff --git a/development/source-highlight/source-highlight.SlackBuild b/development/source-highlight/source-highlight.SlackBuild
index 84b739e6e9..0854130902 100644
--- a/development/source-highlight/source-highlight.SlackBuild
+++ b/development/source-highlight/source-highlight.SlackBuild
@@ -12,7 +12,7 @@ PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -30,8 +30,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -54,10 +54,13 @@ tar xzfv $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 555 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# thanks archlinux!
+patch -p1 < $CWD/gcc11.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/development/srecord/README b/development/srecord/README
index 17dee609e8..f777f18bab 100644
--- a/development/srecord/README
+++ b/development/srecord/README
@@ -2,4 +2,4 @@ srecord (tools for EPROM load files)
The SRecord package is a collection of powerful tools for manipulating
EPROM load files. Many file formats are supported, too many to list
-here. See http://srecord.sourceforge.net/ for the full list.
+here. See http://srecord.sourceforge.net/ for the full list.
diff --git a/development/srecord/slack-desc b/development/srecord/slack-desc
index a36059d237..c2813b1b11 100644
--- a/development/srecord/slack-desc
+++ b/development/srecord/slack-desc
@@ -10,7 +10,7 @@ srecord: srecord (tools for EPROM load files)
srecord:
srecord: The SRecord package is a collection of powerful tools for manipulating
srecord: EPROM load files. Many file formats are supported, too many to
-srecord: list here. See http://srecord.sourceforge.net/ for the full list.
+srecord: list here. See http://srecord.sourceforge.net/ for the full list.
srecord:
srecord:
srecord:
diff --git a/development/srecord/srecord.SlackBuild b/development/srecord/srecord.SlackBuild
index d07ad4c807..1e530da361 100644
--- a/development/srecord/srecord.SlackBuild
+++ b/development/srecord/srecord.SlackBuild
@@ -6,6 +6,12 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210907 bkw: BUILD=2
+# - get rid of useless BUILDING.pdf
+# - move PDF docs directly into the doc dir (instead of a subdir of it)
+# - get rid of .la file
+# - make the script code easier to read (for me anyway)
+
# 20140819 bkw: updated for v1.64, switched to regular sourceforge download
# URL. Turns out the short URL on the main site will disappear whenever
# there's a new release.
@@ -14,7 +20,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=srecord
VERSION=${VERSION:-1.64}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -26,9 +32,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
@@ -61,42 +64,43 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+DOCDIR=/usr/doc/$PRGNAM-$VERSION
+PKGDOC=$PKG/$DOCDIR
+LIBDIR=/usr/lib$LIBDIRSUFFIX
+PKGLIB=$PKG/$LIBDIR
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --libdir=$LIBDIR \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --docdir=$DOCDIR \
--build=$ARCH-slackware-linux
make
make install DESTDIR=$PKG
# don't need static lib, and --disable-static doesn't work
-rm -f $PKG/usr/lib$LIBDIRSUFFIX/*.a
+rm -f $PKGLIB/*.a
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+strip $PKG/usr/bin/* $PKGLIB/*.so.?.?.?
+rm -f $PKGLIB/*.la
-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
+gzip -9 $PKG/usr/man/man?/*
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKGDOC
+cp -a AUTHORS LICENSE README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
# --docdir is ignored, too
-mv $PKG/usr/share/doc/$PRGNAM/ $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share
+mv $PKG/usr/share/doc/$PRGNAM/* $PKGDOC
+rm -rf $PKG/usr/share $PKGDOC/BUILDING.pdf
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/srecord/srecord.info b/development/srecord/srecord.info
index 472c5985f1..44dc3bf7e8 100644
--- a/development/srecord/srecord.info
+++ b/development/srecord/srecord.info
@@ -1,7 +1,7 @@
PRGNAM="srecord"
VERSION="1.64"
HOMEPAGE="http://srecord.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/srecord/srecord/1.64/srecord-1.64.tar.gz"
+DOWNLOAD="https://downloads.sourceforge.net/project/srecord/srecord/1.64/srecord-1.64.tar.gz"
MD5SUM="4de4a7497472d7972645c2af91313769"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/development/systemtap/int.patch b/development/systemtap/int.patch
new file mode 100644
index 0000000000..b412a51894
--- /dev/null
+++ b/development/systemtap/int.patch
@@ -0,0 +1,48 @@
+Lockywolf <lockywolf@gmail.com>
+
+diff -Naur systemtap-4.5.orig/staprun/monitor.c systemtap-4.5/staprun/monitor.c
+--- systemtap-4.5.orig/staprun/monitor.c 2021-05-07 21:20:39.000000000 +0200
++++ systemtap-4.5/staprun/monitor.c 2021-10-15 11:57:04.770964000 +0200
+@@ -448,12 +448,12 @@
+ if (active_window == 0)
+ wattron(status, A_BOLD);
+ wprintw(status, "\n%*s\t%*s\t%*s\t%*s\t%*s\t%*s\t%s\n",
+- width[p_index], HIGHLIGHT("index", p_index, comp_fn_index),
+- width[p_state], HIGHLIGHT("state", p_state, comp_fn_index),
+- width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index),
+- width[p_min], HIGHLIGHT("min", p_min, comp_fn_index),
+- width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index),
+- width[p_max], HIGHLIGHT("max", p_max, comp_fn_index),
++ (int)width[p_index], HIGHLIGHT("index", p_index, comp_fn_index),
++ (int)width[p_state], HIGHLIGHT("state", p_state, comp_fn_index),
++ (int)width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index),
++ (int)width[p_min], HIGHLIGHT("min", p_min, comp_fn_index),
++ (int)width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index),
++ (int)width[p_max], HIGHLIGHT("max", p_max, comp_fn_index),
+ HIGHLIGHT("name", p_name, comp_fn_index));
+ if (active_window == 0)
+ wattroff(status, A_BOLD);
+@@ -466,17 +466,17 @@
+ json_object *probe, *field;
+ probe = json_object_array_get_idx(jso_probe_list, i);
+ json_object_object_get_ex(probe, "index", &field);
+- wprintw(status, "%*s\t", width[p_index], json_object_get_string(field));
++ wprintw(status, "%*s\t", (int)width[p_index], json_object_get_string(field));
+ json_object_object_get_ex(probe, "state", &field);
+- wprintw(status, "%*s\t", width[p_state], json_object_get_string(field));
++ wprintw(status, "%*s\t", (int)width[p_state], json_object_get_string(field));
+ json_object_object_get_ex(probe, "hits", &field);
+- wprintw(status, "%*s\t", width[p_hits], json_object_get_string(field));
++ wprintw(status, "%*s\t", (int)width[p_hits], json_object_get_string(field));
+ json_object_object_get_ex(probe, "min", &field);
+- wprintw(status, "%*s\t", width[p_min], json_object_get_string(field));
++ wprintw(status, "%*s\t", (int)width[p_min], json_object_get_string(field));
+ json_object_object_get_ex(probe, "avg", &field);
+- wprintw(status, "%*s\t", width[p_avg], json_object_get_string(field));
++ wprintw(status, "%*s\t", (int)width[p_avg], json_object_get_string(field));
+ json_object_object_get_ex(probe, "max", &field);
+- wprintw(status, "%*s\t", width[p_max], json_object_get_string(field));
++ wprintw(status, "%*s\t", (int)width[p_max], json_object_get_string(field));
+ getyx(status, discard, cur_x);
+ json_object_object_get_ex(probe, "name", &field);
+ wprintw(status, "%.*s", max_cols-cur_x-1, json_object_get_string(field));
diff --git a/development/systemtap/systemtap.SlackBuild b/development/systemtap/systemtap.SlackBuild
index cc31dbd3be..62eff9de5b 100644
--- a/development/systemtap/systemtap.SlackBuild
+++ b/development/systemtap/systemtap.SlackBuild
@@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=systemtap
-VERSION=${VERSION:-4.1}
+VERSION=${VERSION:-4.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -80,6 +80,10 @@ 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 {} \;
+patch -p1 < $CWD/int.patch
+
+export PYTHON=python3
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -95,6 +99,9 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
+# stap-server is not supported by this build
+rm -fR $PKG/var/run
+
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/development/systemtap/systemtap.info b/development/systemtap/systemtap.info
index 916de83df8..e8be62cd34 100644
--- a/development/systemtap/systemtap.info
+++ b/development/systemtap/systemtap.info
@@ -1,8 +1,8 @@
PRGNAM="systemtap"
-VERSION="4.1"
+VERSION="4.5"
HOMEPAGE="https://sourceware.org/systemtap/"
-DOWNLOAD="https://sourceware.org/systemtap/ftp/releases/systemtap-4.1.tar.gz"
-MD5SUM="0cc7403c7b5e442a2fa92fe01ea3a636"
+DOWNLOAD="https://sourceware.org/systemtap/ftp/releases/systemtap-4.5.tar.gz"
+MD5SUM="39369e2aa08636ea6600464e9fdc5185"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/tea/tea.SlackBuild b/development/tea/tea.SlackBuild
index f346756950..96159f8db3 100644
--- a/development/tea/tea.SlackBuild
+++ b/development/tea/tea.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=tea
-VERSION=${VERSION:-60.4.0}
+VERSION=${VERSION:-60.5.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/tea/tea.info b/development/tea/tea.info
index 47dcb8c4c8..4fa66367f4 100644
--- a/development/tea/tea.info
+++ b/development/tea/tea.info
@@ -1,8 +1,8 @@
PRGNAM="tea"
-VERSION="60.4.0"
-HOMEPAGE="http://semiletov.org/tea/"
-DOWNLOAD="https://github.com/psemiletov/tea-qt/archive/60.4.0/tea-qt-60.4.0.tar.gz"
-MD5SUM="6cf13ad2036e1d5da53538dbae08d893"
+VERSION="60.5.0"
+HOMEPAGE="https://tea.ourproject.org/"
+DOWNLOAD="https://github.com/psemiletov/tea-qt/archive/60.5.0/tea-qt-60.5.0.tar.gz"
+MD5SUM="8078690f84d55040053d22a7f48f56ba"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/tiled/tiled.SlackBuild b/development/tiled/tiled.SlackBuild
index 230e3910cf..9a7c4d5275 100644
--- a/development/tiled/tiled.SlackBuild
+++ b/development/tiled/tiled.SlackBuild
@@ -27,7 +27,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=tiled
-VERSION=${VERSION:-1.7.1}
+VERSION=${VERSION:-1.7.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/tiled/tiled.info b/development/tiled/tiled.info
index cd94316056..ca28172bb7 100644
--- a/development/tiled/tiled.info
+++ b/development/tiled/tiled.info
@@ -1,8 +1,8 @@
PRGNAM="tiled"
-VERSION="1.7.1"
+VERSION="1.7.2"
HOMEPAGE="https://www.mapeditor.org"
-DOWNLOAD="https://github.com/bjorn/tiled/archive/v1.7.1/tiled-1.7.1.tar.gz"
-MD5SUM="4b237fd90d6005b0bbd69051bc41eec1"
+DOWNLOAD="https://github.com/bjorn/tiled/archive/v1.7.2/tiled-1.7.2.tar.gz"
+MD5SUM="56b9bccc4197f89a7a29c6fecaec87eb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="qbs"
diff --git a/development/tweak/20200601.diff b/development/tweak/20200601.diff
new file mode 100644
index 0000000000..2fc610999a
--- /dev/null
+++ b/development/tweak/20200601.diff
@@ -0,0 +1,1315 @@
+diff -Naur tweak-3.02/actions.c tweak-3.02.patched/actions.c
+--- tweak-3.02/actions.c 2016-03-22 17:12:51.000000000 -0400
++++ tweak-3.02.patched/actions.c 2021-09-07 14:21:21.913810300 -0400
+@@ -112,11 +112,11 @@
+ display_write_str (question);
+ display_refresh();
+ }
+- safe_update = TRUE;
++ safe_update = true;
+ #endif
+ c = display_getkey();
+ #if defined(unix) && !defined(GO32)
+- safe_update = FALSE;
++ safe_update = false;
+ #endif
+ if (c >= 'a' && c <= 'z')
+ c += 'A'-'a';
+@@ -130,32 +130,43 @@
+ return; /* don't even quit */
+ }
+ }
+- finished = TRUE;
++ finished = true;
+ }
+
+-static void act_save(void) {
+- static int backed_up = FALSE;
++static bool act_save_internal(void) {
++ static bool backed_up = false;
+
++ if (look_mode) {
++ display_beep();
++ strcpy (message, "Cannot save in LOOK mode!");
++ return false;
++ }
+ if (!backed_up) {
+ if (!backup_file()) {
+ display_beep();
+ strcpy (message, "Unable to back up file!");
+- return;
++ return false;
+ }
+- backed_up = TRUE;
++ backed_up = true;
+ }
+ if (!save_file()) {
+ display_beep();
+ strcpy (message, "Unable to save file!");
+- return;
++ return false;
+ }
+- modified = FALSE;
++ modified = false;
++ return true;
++}
++
++static void act_save(void) {
++ act_save_internal(); /* just discard the bool return value */
+ }
+
+ static void act_exitsave(void) {
+- act_save();
+- draw_scr(); /* update ** on status line */
+- act_exit();
++ if (act_save_internal()) {
++ draw_scr(); /* update ** on status line */
++ act_exit();
++ }
+ }
+
+ static void act_top (void) {
+@@ -294,7 +305,7 @@
+ display_beep();
+ sprintf(message, "Can't engage Insert mode when in %s mode",
+ (look_mode ? "LOOK" : "FIX"));
+- insert_mode = FALSE; /* safety! */
++ insert_mode = false; /* safety! */
+ } else
+ insert_mode = !insert_mode;
+ }
+@@ -307,7 +318,7 @@
+ }
+
+ void act_self_ins(void) {
+- int insert = insert_mode;
++ bool insert = insert_mode;
+ unsigned char c;
+
+ if (look_mode) {
+@@ -352,17 +363,17 @@
+ buf_fetch_data(filedata, &c, 1, cur_pos);
+ c &= 0xF0;
+ c |= last_char;
+- insert = FALSE;
++ insert = false;
+ break;
+ }
+
+ if (insert) {
+ buf_insert_data(filedata, &c, 1, cur_pos);
+ file_size++;
+- modified = TRUE;
++ modified = true;
+ } else if (cur_pos < file_size) {
+ buf_overwrite_data(filedata, &c, 1, cur_pos);
+- modified = TRUE;
++ modified = true;
+ } else {
+ display_beep();
+ strcpy(message, "End of file reached");
+@@ -379,7 +390,7 @@
+ buf_delete (filedata, 1, cur_pos);
+ file_size--;
+ edit_type = !!edit_type;
+- modified = TRUE;
++ modified = true;
+ }
+ }
+
+@@ -391,7 +402,7 @@
+ buf_delete (filedata, 1, cur_pos);
+ file_size--;
+ edit_type = !!edit_type;
+- modified = TRUE;
++ modified = true;
+ }
+ }
+
+@@ -399,7 +410,7 @@
+ if (look_mode) {
+ display_beep();
+ strcpy (message, "Can't cut or paste in LOOK mode");
+- marking = FALSE; /* safety */
++ marking = false; /* safety */
+ return;
+ }
+ marking = !marking;
+@@ -435,8 +446,8 @@
+ if (top_pos > cur_pos)
+ top_pos = begline(cur_pos);
+ edit_type = !!edit_type;
+- modified = TRUE;
+- marking = FALSE;
++ modified = true;
++ marking = false;
+ }
+
+ static void act_copy (void) {
+@@ -456,7 +467,7 @@
+ if (cutbuffer)
+ buf_free (cutbuffer);
+ cutbuffer = buf_copy (filedata, marksize, marktop);
+- marking = FALSE;
++ marking = false;
+ }
+
+ static void act_paste (void) {
+@@ -475,7 +486,7 @@
+ file_size -= cutsize;
+ }
+ buf_paste (filedata, cutbuffer, cur_pos);
+- modified = TRUE;
++ modified = true;
+ cur_pos += cutsize;
+ file_size += cutsize;
+ edit_type = !!edit_type;
+@@ -494,9 +505,9 @@
+ static void act_goto (void) {
+ char buffer[80];
+ fileoffset_t position, new_top;
+- int error;
++ bool error;
+
+- if (!get_str("Enter position to go to: ", buffer, FALSE))
++ if (!get_str("Enter position to go to: ", buffer, false))
+ return; /* user break */
+
+ position = parse_num (buffer, &error);
+@@ -531,16 +542,16 @@
+ statfmt = decstatus;
+ }
+
+-static int search_prompt(char *withdef, char *withoutdef)
++static bool search_prompt(char *withdef, char *withoutdef)
+ {
+ char buffer[80];
+ int len;
+
+- if (!get_str(last_search ? withdef : withoutdef, buffer, TRUE))
+- return 0; /* user break */
++ if (!get_str(last_search ? withdef : withoutdef, buffer, true))
++ return false; /* user break */
+ if (!last_search && !*buffer) {
+ strcpy (message, "Search aborted.");
+- return 0;
++ return false;
+ }
+
+ if (!*buffer) {
+@@ -550,14 +561,14 @@
+ if (len == -1) {
+ display_beep();
+ strcpy (message, "Invalid escape sequence in search string");
+- return 0;
++ return false;
+ }
+ if (last_search)
+ free_search(last_search);
+ last_search = build_search (buffer, len);
+ }
+
+- return 1;
++ return true;
+ }
+
+ static void act_search (void) {
+@@ -660,10 +671,10 @@
+ char prompt[80];
+ fileoffset_t w;
+ fileoffset_t new_top;
+- int error;
++ bool error;
+
+ sprintf (prompt, "Enter screen width in bytes (now %"OFF"d): ", width);
+- if (!get_str (prompt, buffer, FALSE))
++ if (!get_str (prompt, buffer, false))
+ return;
+ w = parse_num (buffer, &error);
+ if (error) {
+@@ -686,11 +697,11 @@
+ char prompt[80];
+ fileoffset_t o;
+ fileoffset_t new_top;
+- int error;
++ bool error;
+
+ sprintf (prompt, "Enter start-of-file offset in bytes (now %"OFF"d): ",
+ realoffset);
+- if (!get_str (prompt, buffer, FALSE))
++ if (!get_str (prompt, buffer, false))
+ return;
+ o = parse_num (buffer, &error);
+ if (error) {
+diff -Naur tweak-3.02/btree.c tweak-3.02.patched/btree.c
+--- tweak-3.02/btree.c 2016-03-22 17:12:51.000000000 -0400
++++ tweak-3.02.patched/btree.c 2021-09-07 14:21:21.902810301 -0400
+@@ -47,7 +47,7 @@
+ * - user-supplied copy function.
+ * - bt_add when element already exists.
+ * - bt_del when element doesn't.
+- * - splitpos with before==TRUE.
++ * - splitpos with before==true.
+ * - split() on sorted elements (but it should be fine).
+ * - bt_replace, at all (it won't be useful until we get user read
+ * properties).
+@@ -162,13 +162,6 @@
+ free(p);
+ }
+
+-#ifndef FALSE
+-#define FALSE 0
+-#endif
+-#ifndef TRUE
+-#define TRUE 1
+-#endif
+-
+ /* We could probably do with more compiler-specific branches of this #if. */
+ #if defined(__GNUC__)
+ #define INLINE __inline
+@@ -274,7 +267,7 @@
+ /*
+ * Determine whether a node is a leaf node or not.
+ */
+-static INLINE int bt_is_leaf(btree *bt, nodeptr n)
++static INLINE bool bt_is_leaf(btree *bt, nodeptr n)
+ {
+ return n[0].na.p == NULL;
+ }
+@@ -292,7 +285,7 @@
+ #else
+ memset((char *)ret + bt->propoffset, 0, bt->propsize);
+ #endif
+- testlock(TRUE, TRUE, ret);
++ testlock(true, true, ret);
+ return ret;
+ }
+
+@@ -301,7 +294,7 @@
+ */
+ static INLINE void bt_destroy_node(btree *bt, nodeptr n)
+ {
+- testlock(TRUE, FALSE, n);
++ testlock(true, false, n);
+ /* Free the property. */
+ bt->propmerge(bt->userstate, NULL, NULL, n + bt->maxdegree * 2 + 2);
+ sfree(n);
+@@ -312,8 +305,8 @@
+ */
+ static INLINE nodeptr bt_reuse_node(btree *bt, nodeptr n, int nsubtrees)
+ {
+- testlock(TRUE, FALSE, n);
+- testlock(TRUE, TRUE, n);
++ testlock(true, false, n);
++ testlock(true, true, n);
+ n[bt->maxdegree*2-1].i = nsubtrees;
+ return n;
+ }
+@@ -405,10 +398,10 @@
+ if (addr.p && addr.p[bt->maxdegree*2+1].i > 1) {
+ nodeptr clone = bt_clone_node(bt, addr.p);
+ bt_set_child(bt, a, index, bt_node_addr(bt, clone));
+- testlock(TRUE, TRUE, clone);
++ testlock(true, true, clone);
+ return clone;
+ }
+- testlock(TRUE, TRUE, addr.p);
++ testlock(true, true, addr.p);
+ return addr.p;
+ }
+ static INLINE nodeptr bt_write_lock_root(btree *bt)
+@@ -417,21 +410,21 @@
+ if (addr.p && addr.p[bt->maxdegree*2+1].i > 1) {
+ nodeptr clone = bt_clone_node(bt, addr.p);
+ bt->root = bt_node_addr(bt, clone);
+- testlock(TRUE, TRUE, clone);
++ testlock(true, true, clone);
+ return clone;
+ }
+- testlock(TRUE, TRUE, addr.p);
++ testlock(true, true, addr.p);
+ return addr.p;
+ }
+ static INLINE nodeptr bt_read_lock(btree *bt, node_addr a)
+ {
+- testlock(FALSE, TRUE, a.p);
++ testlock(false, true, a.p);
+ return a.p;
+ }
+ #define bt_read_lock_root(bt) (bt_read_lock(bt, (bt)->root))
+ #define bt_read_lock_child(bt,a,index) (bt_read_lock(bt,bt_child(bt,a,index)))
+
+-static INLINE void bt_write_relock(btree *bt, nodeptr n, int props)
++static INLINE void bt_write_relock(btree *bt, nodeptr n, bool props)
+ {
+ int i, ns, count;
+
+@@ -443,8 +436,8 @@
+ for (i = 0; i < ns; i++)
+ count += bt_child_count(bt, n, i);
+ n[bt->maxdegree*2].i = count;
+- testlock(TRUE, FALSE, n);
+- testlock(TRUE, TRUE, n);
++ testlock(true, false, n);
++ testlock(true, true, n);
+
+ /*
+ * Update user read properties.
+@@ -477,13 +470,13 @@
+ }
+
+ static INLINE node_addr bt_write_unlock_internal(btree *bt, nodeptr n,
+- int props)
++ bool props)
+ {
+ node_addr ret;
+
+ bt_write_relock(bt, n, props);
+
+- testlock(TRUE, FALSE, n);
++ testlock(true, false, n);
+
+ ret.p = n;
+ return ret;
+@@ -491,7 +484,7 @@
+
+ static INLINE node_addr bt_write_unlock(btree *bt, nodeptr n)
+ {
+- return bt_write_unlock_internal(bt, n, TRUE);
++ return bt_write_unlock_internal(bt, n, true);
+ }
+
+ static INLINE void bt_read_unlock(btree *bt, nodeptr n)
+@@ -500,7 +493,7 @@
+ * For trees in memory, we do nothing here, except run some
+ * optional testing.
+ */
+- testlock(FALSE, FALSE, n);
++ testlock(false, false, n);
+ }
+
+ /* ----------------------------------------------------------------------
+@@ -594,14 +587,14 @@
+ * searching for that element.
+ *
+ * Return value is either the index of the element, or the index of
+- * the subtree (both 0 upwards). `is_elt' returns FALSE or TRUE
++ * the subtree (both 0 upwards). `is_elt' returns false or true
+ * respectively.
+ *
+ * Since this may be used by bt_find() with an alternative cmpfn_t,
+ * we always pass the input element as the first argument to cmp.
+ */
+ static int bt_lookup_cmp(btree *bt, nodeptr n, bt_element_t element,
+- cmpfn_t cmp, int *is_elt)
++ cmpfn_t cmp, bool *is_elt)
+ {
+ int mintree = 0, maxtree = bt_subtrees(bt, n)-1;
+
+@@ -610,7 +603,7 @@
+ int c = cmp(bt->userstate, element, bt_element(bt, n, elt));
+
+ if (c == 0) {
+- *is_elt = TRUE;
++ *is_elt = true;
+ return elt;
+ } else if (c < 0) {
+ /*
+@@ -634,7 +627,7 @@
+ * to search next.
+ */
+ assert(mintree == maxtree);
+- *is_elt = FALSE;
++ *is_elt = false;
+ return mintree;
+ }
+
+@@ -986,7 +979,8 @@
+ int relation, int *index)
+ {
+ nodeptr n, n2;
+- int child, is_elt;
++ int child;
++ bool is_elt;
+ bt_element_t gotit;
+ int pos = 0;
+
+@@ -1083,7 +1077,8 @@
+ int *index)
+ {
+ nodeptr n, n2;
+- int i, j, count, is_elt;
++ int i, j, count;
++ bool is_elt;
+ void **props;
+ int *counts;
+ bt_element_t *elts;
+@@ -1294,7 +1289,8 @@
+ bt_element_t bt_add(btree *bt, bt_element_t element)
+ {
+ nodeptr n, n2;
+- int child, is_elt;
++ int child;
++ bool is_elt;
+ int pos = 0;
+
+ n = bt_read_lock_root(bt);
+@@ -1322,7 +1318,8 @@
+ {
+ nodeptr n, c, c2, saved_n;
+ nodeptr *nodes;
+- int nnodes, child, nroot, pos2, ends, st, splitpoint, saved_pos;
++ int nnodes, child, pos2, ends, st, splitpoint, saved_pos;
++ bool nroot;
+ bt_element_t e, ret;
+
+ /*
+@@ -1334,7 +1331,7 @@
+ nnodes = 0;
+
+ n = bt_write_lock_root(bt);
+- nroot = TRUE;
++ nroot = true;
+ saved_n = NULL;
+
+ if (!n || pos < 0 || pos >= bt_node_count(bt, n)) {
+@@ -1405,7 +1402,7 @@
+ bt_shift_root(bt, n, bt_node_addr(bt, c));
+ nnodes--; /* don't leave it in nodes[]! */
+ n = NULL;
+- bt_write_relock(bt, c, TRUE);
++ bt_write_relock(bt, c, true);
+ } else
+ bt_write_unlock(bt, c);
+ } else {
+@@ -1422,7 +1419,7 @@
+
+ if (n) {
+ /* Recompute the counts in n so we can do lookups again. */
+- bt_write_relock(bt, n, TRUE);
++ bt_write_relock(bt, n, true);
+
+ /* Having done the transform, redo the position lookup. */
+ pos = pos2;
+@@ -1485,7 +1482,7 @@
+
+ /* Descend to the child and go round again. */
+ n = c;
+- nroot = FALSE;
++ nroot = false;
+ }
+
+ /*
+@@ -1725,7 +1722,7 @@
+ * Perform the healing process after a tree has been split. `rhs'
+ * is set if the cut edge is the one on the right.
+ */
+-static void bt_split_heal(btree *bt, int rhs)
++static void bt_split_heal(btree *bt, bool rhs)
+ {
+ nodeptr n;
+ nodeptr *nodes;
+@@ -1881,15 +1878,15 @@
+ * which will sort all that out for us.
+ */
+ while (nnodes-- > 0) {
+- bt_write_unlock_internal(bt1, lnodes[nnodes], FALSE);
+- bt_write_unlock_internal(bt2, rnodes[nnodes], FALSE);
++ bt_write_unlock_internal(bt1, lnodes[nnodes], false);
++ bt_write_unlock_internal(bt2, rnodes[nnodes], false);
+ }
+
+ /*
+ * Then we make a healing pass down each side of the tree.
+ */
+- bt_split_heal(bt1, TRUE);
+- bt_split_heal(bt2, FALSE);
++ bt_split_heal(bt1, true);
++ bt_split_heal(bt2, false);
+
+ ifree(lnodes);
+ ifree(rnodes);
+@@ -1900,7 +1897,7 @@
+ /*
+ * Split a tree at a numeric index.
+ */
+-btree *bt_splitpos(btree *bt, int index, int before)
++btree *bt_splitpos(btree *bt, int index, bool before)
+ {
+ btree *ret;
+ node_addr na;
+@@ -1932,15 +1929,16 @@
+ */
+ btree *bt_split(btree *bt, bt_element_t element, cmpfn_t cmp, int rel)
+ {
+- int before, index;
++ bool before;
++ int index;
+
+ assert(rel != BT_REL_EQ); /* has to be an inequality */
+
+ if (rel == BT_REL_GT || rel == BT_REL_GE) {
+- before = TRUE;
++ before = true;
+ rel = (rel == BT_REL_GT ? BT_REL_LE : BT_REL_LT);
+ } else {
+- before = FALSE;
++ before = false;
+ }
+ if (!bt_findrelpos(bt, element, cmp, rel, &index))
+ index = -1;
+@@ -1979,7 +1977,7 @@
+ n = bt_read_lock_root(bt);
+ i = bt_subtrees(bt, n);
+ bt_read_unlock(bt, n);
+- return (i == 2 ? TRUE : FALSE);
++ return (i == 2 ? true : false);
+ }
+
+ /*
+@@ -2394,7 +2392,7 @@
+ printf("splittest: %d\n", i);
+ tree3 = BT_COPY(tree);
+ testlock(-1, 0, NULL);
+- tree4 = bt_splitpos(tree3, i, 0);
++ tree4 = bt_splitpos(tree3, i, false);
+ testlock(-1, 0, NULL);
+ verifytree(tree3, array, i);
+ verifytree(tree4, array+i, arraylen-i);
+diff -Naur tweak-3.02/btree.h tweak-3.02.patched/btree.h
+--- tweak-3.02/btree.h 2016-03-22 17:12:51.000000000 -0400
++++ tweak-3.02.patched/btree.h 2021-09-07 14:21:21.903810301 -0400
+@@ -31,6 +31,7 @@
+ #define BTREE_H
+
+ #include <stddef.h> /* for offsetof */
++#include <stdbool.h>
+
+ #ifndef alignof
+ #define alignof(typ) ( offsetof(struct { char c; typ t; }, t) )
+@@ -47,7 +48,7 @@
+ typedef void (*propmergefn_t)(void *state, void *s1, void *s2, void *dest);
+ typedef int (*searchfn_t)(void *tstate, void *sstate, int ntrees,
+ void **props, int *counts,
+- bt_element_t *elts, int *is_elt);
++ bt_element_t *elts, bool *is_elt);
+
+ enum {
+ BT_REL_EQ, BT_REL_LT, BT_REL_LE, BT_REL_GT, BT_REL_GE
+@@ -77,7 +78,7 @@
+ bt_element_t bt_del(btree *bt, bt_element_t element);
+ btree *bt_join(btree *bt1, btree *bt2);
+ btree *bt_joinr(btree *bt1, btree *bt2);
+-btree *bt_splitpos(btree *bt, int index, int before);
++btree *bt_splitpos(btree *bt, int index, bool before);
+ btree *bt_split(btree *bt, bt_element_t element, cmpfn_t cmp, int rel);
+
+ #endif /* BTREE_H */
+diff -Naur tweak-3.02/buffer.c tweak-3.02.patched/buffer.c
+--- tweak-3.02/buffer.c 2016-03-22 17:12:51.000000000 -0400
++++ tweak-3.02.patched/buffer.c 2021-09-07 14:21:21.917810299 -0400
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <errno.h>
+ #include <ctype.h>
+ #include <assert.h>
+
+@@ -112,7 +113,7 @@
+
+ static int bufblksearch(void *tstate, void *sstate, int ntrees,
+ void **props, int *counts,
+- bt_element_t *elts, int *is_elt)
++ bt_element_t *elts, bool *is_elt)
+ {
+ fileoffset_t *disttogo = (fileoffset_t *)sstate;
+ fileoffset_t distsofar = 0;
+@@ -128,7 +129,7 @@
+ /*
+ * Descend into this subtree.
+ */
+- *is_elt = FALSE;
++ *is_elt = false;
+ return i;
+ }
+
+@@ -142,7 +143,7 @@
+ * Select this element.
+ */
+ *disttogo -= distsofar;
+- *is_elt = TRUE;
++ *is_elt = true;
+ return i;
+ }
+
+@@ -164,6 +165,16 @@
+ return index;
+ }
+
++static void fread_check(void *buf, size_t size, FILE *fp)
++{
++ if (fread(buf, 1, size, fp) != size) {
++ display_cleanup();
++ fprintf(stderr, "Fatal error reading from file: %s\n",
++ strerror(errno));
++ exit(1);
++ }
++}
++
+ /*
+ * Convert a file-data block of size at most BUFMAX into a
+ * literal-data block. Returns the replacement block (the old one
+@@ -179,7 +190,7 @@
+ ret->filepos = 0;
+ ret->len = blk->len;
+ fseeko(blk->file->fp, blk->filepos, SEEK_SET);
+- fread(ret->data, blk->len, 1, blk->file->fp);
++ fread_check(ret->data, blk->len, blk->file->fp);
+
+ return ret;
+ }
+@@ -298,7 +309,7 @@
+ return index + 1;
+ }
+
+-static btree *buf_bt_split(btree *bt, fileoffset_t pos, int before)
++static btree *buf_bt_split(btree *bt, fileoffset_t pos, bool before)
+ {
+ int index = buf_bt_splitpoint(bt, pos);
+ return bt_splitpos(bt, index, before);
+@@ -318,14 +329,14 @@
+
+ static void buf_insert_bt(buffer *buf, btree *bt, fileoffset_t pos)
+ {
+- btree *right = buf_bt_split(buf->bt, pos, FALSE);
++ btree *right = buf_bt_split(buf->bt, pos, false);
+ buf->bt = buf_bt_join(buf->bt, bt);
+ buf->bt = buf_bt_join(buf->bt, right);
+ }
+
+ static int bufblklensearch(void *tstate, void *sstate, int ntrees,
+ void **props, int *counts,
+- bt_element_t *elts, int *is_elt)
++ bt_element_t *elts, bool *is_elt)
+ {
+ fileoffset_t *output = (fileoffset_t *)sstate;
+ fileoffset_t size = 0;
+@@ -347,7 +358,7 @@
+ *output = size;
+
+ /* Actual return value doesn't matter */
+- *is_elt = TRUE;
++ *is_elt = true;
+ return 1;
+ }
+
+@@ -417,7 +428,7 @@
+
+ if (blk->file) {
+ fseeko(blk->file->fp, blk->filepos + poswithin, SEEK_SET);
+- fread(data, thislen, 1, blk->file->fp);
++ fread_check(data, thislen, blk->file->fp);
+ } else {
+ memcpy(data, blk->data + poswithin, thislen);
+ }
+@@ -473,8 +484,8 @@
+
+ extern void buf_delete(buffer *buf, fileoffset_t len, fileoffset_t pos)
+ {
+- btree *left = buf_bt_split(buf->bt, pos, TRUE);
+- btree *right = buf_bt_split(buf->bt, len, FALSE);
++ btree *left = buf_bt_split(buf->bt, pos, true);
++ btree *right = buf_bt_split(buf->bt, len, false);
+
+ bt_free(buf->bt);
+
+@@ -490,8 +501,8 @@
+
+ extern buffer *buf_cut(buffer *buf, fileoffset_t len, fileoffset_t pos)
+ {
+- btree *left = buf_bt_split(buf->bt, pos, TRUE);
+- btree *right = buf_bt_split(buf->bt, len, FALSE);
++ btree *left = buf_bt_split(buf->bt, pos, true);
++ btree *right = buf_bt_split(buf->bt, len, false);
+ btree *ret = buf->bt;
+
+ buf->bt = buf_bt_join(left, right);
+@@ -501,8 +512,8 @@
+
+ extern buffer *buf_copy(buffer *buf, fileoffset_t len, fileoffset_t pos)
+ {
+- btree *left = buf_bt_split(buf->bt, pos, TRUE);
+- btree *right = buf_bt_split(buf->bt, len, FALSE);
++ btree *left = buf_bt_split(buf->bt, pos, true);
++ btree *right = buf_bt_split(buf->bt, len, false);
+ btree *ret = bt_clone(buf->bt);
+
+ buf->bt = buf_bt_join(left, buf->bt);
+diff -Naur tweak-3.02/curses.c tweak-3.02.patched/curses.c
+--- tweak-3.02/curses.c 2016-03-22 17:12:51.000000000 -0400
++++ tweak-3.02.patched/curses.c 2021-09-07 14:21:21.918810299 -0400
+@@ -61,7 +61,7 @@
+ #define MAXCOLOURS 32
+ int attrs[MAXCOLOURS];
+
+-void display_define_colour(int colour, int fg, int bg, int reverse)
++void display_define_colour(int colour, int fg, int bg, bool reverse)
+ {
+ static int colours[8] = {
+ COLOR_BLACK,
+@@ -117,24 +117,28 @@
+ schedule_update();
+ continue;
+ }
++ if (ret == ERR) {
++ /* A failure to read from standard input is fatal */
++ exit(1);
++ }
+ return ret;
+ }
+ }
+
+-int display_input_to_flush(void)
++bool display_input_to_flush(void)
+ {
+ int ret;
+ if (last_getch != ERR)
+- return TRUE;
++ return true;
+
+ nodelay(stdscr, 1);
+ ret = getch();
+ nodelay(stdscr, 0);
+ if (ret == ERR)
+- return FALSE;
++ return false;
+
+ last_getch = ret;
+- return TRUE;
++ return true;
+ }
+
+ void display_post_error(void)
+diff -Naur tweak-3.02/keytab.c tweak-3.02.patched/keytab.c
+--- tweak-3.02/keytab.c 2016-03-22 17:12:51.000000000 -0400
++++ tweak-3.02.patched/keytab.c 2021-09-07 14:21:21.920810299 -0400
+@@ -61,16 +61,33 @@
+ /*
+ * Format an ASCII code into a printable description of the key stroke.
+ */
+-static void strkey (char *s, int k) {
+- k &= 255; /* force unsigned */
+- if (k==27)
+- strcpy(s, " ESC");
+- else if (k<32 || k==127)
+- sprintf(s, " ^%c", k ^ 64);
+- else if (k<127)
+- sprintf(s, " %c", k);
+- else
+- sprintf(s, " <0x%2X>", k);
++struct strkey_state {
++ char *s, *end;
++ bool truncated;
++};
++static void strkey (struct strkey_state *sks, int k) {
++ char thisbuf[32];
++
++ if (sks->truncated)
++ return;
++
++ if (sks->end - sks->s < 16) {
++ sks->truncated = true;
++ strcpy(thisbuf, " ...");
++ } else {
++ k &= 255; /* force unsigned */
++ if (k==27)
++ strcpy(thisbuf, " ESC");
++ else if (k<32 || k==127)
++ sprintf(thisbuf, " ^%c", k ^ 64);
++ else if (k<127)
++ sprintf(thisbuf, " %c", k);
++ else
++ sprintf(thisbuf, " <0x%2X>", k);
++ }
++
++ strcpy(sks->s, thisbuf);
++ sks->s += strlen(sks->s);
+ }
+
+ /*
+@@ -82,19 +99,25 @@
+ #if defined(unix) && !defined(GO32)
+ if (update_required)
+ update();
+- safe_update = TRUE;
++ safe_update = true;
+ #endif
+ last_char = display_getkey();
+ #if defined(unix) && !defined(GO32)
+- safe_update = FALSE;
++ safe_update = false;
+ #endif
+ strcpy(message, "Unknown key sequence");
+- strkey(message+strlen(message), last_char);
++
++ struct strkey_state sks;
++ sks.s = message + strlen(message);
++ sks.end = message + sizeof(message);
++ sks.truncated = false;
++
++ strkey(&sks, last_char);
+ kt = base[(unsigned char) last_char];
+ if (!kt) {
+ display_beep();
+ while (display_input_to_flush())
+- strkey(message+strlen(message), display_getkey());
++ strkey(&sks, display_getkey());
+ return;
+ }
+
+@@ -102,18 +125,18 @@
+ #if defined(unix) && !defined(GO32)
+ if (update_required)
+ update();
+- safe_update = TRUE;
++ safe_update = true;
+ #endif
+ last_char = display_getkey();
+ #if defined(unix) && !defined(GO32)
+- safe_update = FALSE;
++ safe_update = false;
+ #endif
+- strkey(message+strlen(message), last_char);
++ strkey(&sks, last_char);
+ kt = kt->e.extended[(unsigned char) last_char];
+ if (!kt) {
+ display_beep();
+ while (display_input_to_flush())
+- strkey(message+strlen(message), display_getkey());
++ strkey(&sks, display_getkey());
+ return;
+ }
+ }
+diff -Naur tweak-3.02/main.c tweak-3.02.patched/main.c
+--- tweak-3.02/main.c 2016-03-22 17:12:51.000000000 -0400
++++ tweak-3.02.patched/main.c 2021-09-07 14:21:21.903810301 -0400
+@@ -200,20 +200,20 @@
+ char *pname;
+ char *filename = NULL;
+ buffer *filedata, *cutbuffer = NULL;
+-int fix_mode = FALSE;
+-int look_mode = FALSE;
+-int eager_mode = FALSE;
+-int insert_mode = FALSE;
++bool fix_mode = false;
++bool look_mode = false;
++bool eager_mode = false;
++bool insert_mode = false;
+ int edit_type = 1; /* 1,2 are hex digits, 0=ascii */
+-int finished = FALSE;
+-int marking = FALSE;
+-int modified = FALSE;
+-int new_file = FALSE; /* shouldn't need initialisation -
++bool finished = false;
++bool marking = false;
++bool modified = false;
++bool new_file = false; /* shouldn't need initialisation -
+ * but let's not take chances :-) */
+ fileoffset_t width = 16;
+ fileoffset_t realoffset = 0, offset = 16;
+
+-int ascii_enabled = TRUE;
++bool ascii_enabled = true;
+
+ fileoffset_t file_size = 0, top_pos = 0, cur_pos = 0, mark_point = 0;
+
+@@ -284,13 +284,13 @@
+ }
+ break;
+ case 'f': case 'F':
+- fix_mode = TRUE;
++ fix_mode = true;
+ break;
+ case 'l': case 'L':
+- look_mode = TRUE;
++ look_mode = true;
+ break;
+ case 'e': case 'E':
+- eager_mode = TRUE;
++ eager_mode = true;
+ break;
+ case 'D':
+ write_default_rc();
+@@ -339,11 +339,11 @@
+ "Width reduced to %"OFF"d to fit on the screen", width);
+ }
+ if (4*width+14 > display_cols) {
+- ascii_enabled = FALSE;
++ ascii_enabled = false;
+ if (edit_type == 0)
+ edit_type = 1; /* force to hex mode */
+ } else
+- ascii_enabled = TRUE;
++ ascii_enabled = true;
+ offset = realoffset % width;
+ if (!offset)
+ offset = width;
+@@ -358,11 +358,11 @@
+
+ display_setup();
+
+- display_define_colour(COL_BUFFER, -1, -1, FALSE);
+- display_define_colour(COL_SELECT, 0, 7, TRUE);
+- display_define_colour(COL_STATUS, 11, 4, TRUE);
+- display_define_colour(COL_ESCAPE, 9, 0, FALSE);
+- display_define_colour(COL_INVALID, 11, 0, FALSE);
++ display_define_colour(COL_BUFFER, -1, -1, false);
++ display_define_colour(COL_SELECT, 0, 7, true);
++ display_define_colour(COL_STATUS, 11, 4, true);
++ display_define_colour(COL_ESCAPE, 9, 0, false);
++ display_define_colour(COL_INVALID, 11, 0, false);
+
+ for (i=0; i<256; i++) {
+ sprintf(hex[i], "%02X", i);
+@@ -412,7 +412,7 @@
+ "opened %s (size %"OFF"d == 0x%"OFF"X).",
+ fname, file_size, file_size);
+ }
+- new_file = FALSE;
++ new_file = false;
+ } else {
+ if (look_mode || fix_mode) {
+ fprintf(stderr, "%s: file %s not found, and %s mode active\n",
+@@ -421,19 +421,19 @@
+ }
+ filedata = buf_new_empty();
+ snprintf(message, sizeof(message), "New file %s.", fname);
+- new_file = TRUE;
++ new_file = true;
+ }
+ }
+
+ /*
+- * Save the file. Return TRUE on success, FALSE on error.
++ * Save the file. Return true on success, false on error.
+ */
+-int save_file (void) {
++bool save_file (void) {
+ FILE *fp;
+ fileoffset_t pos = 0;
+
+ if (look_mode)
+- return FALSE; /* do nothing! */
++ return false; /* do nothing! */
+
+ if ( (fp = fopen (filename, "wb")) ) {
+ static char buffer[SAVE_BLKSIZ];
+@@ -446,25 +446,25 @@
+ buf_fetch_data (filedata, buffer, size, pos);
+ if (size != fwrite (buffer, 1, size, fp)) {
+ fclose (fp);
+- return FALSE;
++ return false;
+ }
+ pos += size;
+ }
+ } else
+- return FALSE;
++ return false;
+ fclose (fp);
+- return TRUE;
++ return true;
+ }
+
+ /*
+ * Make a backup of the file, if such has not already been done.
+- * Return TRUE on success, FALSE on error.
++ * Return true on success, false on error.
+ */
+-int backup_file (void) {
++bool backup_file (void) {
+ char backup_name[FILENAME_MAX];
+
+ if (new_file)
+- return TRUE; /* unnecessary - pretend it's done */
++ return true; /* unnecessary - pretend it's done */
+ strcpy (backup_name, filename);
+ #if defined(unix) && !defined(GO32)
+ strcat (backup_name, ".bak");
+@@ -498,7 +498,7 @@
+ int scrsize, scroff, llen, i, j;
+ fileoffset_t currpos;
+ fileoffset_t marktop, markbot;
+- int mark;
++ bool mark;
+ char *p;
+ unsigned char c, *q;
+ char *linebuf;
+@@ -657,15 +657,15 @@
+ display_refresh ();
+ }
+
+-volatile int safe_update, update_required;
++volatile bool safe_update, update_required;
+ void update (void);
+
+ /*
+- * Get a string, in the "minibuffer". Return TRUE on success, FALSE
++ * Get a string, in the "minibuffer". Return true on success, false
+ * on break. Possibly syntax-highlight the entered string for
+ * backslash-escapes, depending on the "highlight" parameter.
+ */
+-int get_str (char *prompt, char *buf, int highlight) {
++bool get_str (char *prompt, char *buf, bool highlight) {
+ int maxlen = 79 - strlen(prompt); /* limit to 80 - who cares? :) */
+ int len = 0;
+ int c;
+@@ -702,17 +702,17 @@
+ display_refresh();
+ if (update_required)
+ update();
+- safe_update = TRUE;
++ safe_update = true;
+ c = display_getkey();
+- safe_update = FALSE;
++ safe_update = false;
+ if (c == 13 || c == 10) {
+ buf[len] = '\0';
+- return TRUE;
++ return true;
+ } else if (c == 27 || c == 7) {
+ display_beep();
+ display_post_error();
+ snprintf(message, sizeof(message), "User Break!");
+- return FALSE;
++ return false;
+ }
+
+ if (c >= 32 && c <= 126) {
+@@ -794,12 +794,12 @@
+ if (safe_update)
+ update();
+ else
+- update_required = TRUE;
++ update_required = true;
+ }
+
+-fileoffset_t parse_num (char *buffer, int *error) {
++fileoffset_t parse_num (char *buffer, bool *error) {
+ if (error)
+- *error = FALSE;
++ *error = false;
+ if (!buffer[strspn(buffer, "0123456789")]) {
+ /* interpret as decimal */
+ return ATOOFF(buffer);
+@@ -812,6 +812,6 @@
+ } else {
+ return 0;
+ if (error)
+- *error = TRUE;
++ *error = true;
+ }
+ }
+diff -Naur tweak-3.02/rcfile.c tweak-3.02.patched/rcfile.c
+--- tweak-3.02/rcfile.c 2016-03-22 17:12:51.000000000 -0400
++++ tweak-3.02.patched/rcfile.c 2021-09-07 14:21:21.903810301 -0400
+@@ -146,7 +146,7 @@
+ char rcbuffer[256];
+ char rcname[FILENAME_MAX];
+ int lineno = 0;
+- int errors = FALSE, errors_here;
++ bool errors = false, errors_here;
+
+ #if defined(unix) && !defined(GO32)
+ rcname[0] = '\0';
+@@ -200,7 +200,7 @@
+ strcpy (rcbuffer, *p++);
+ }
+ lineno++;
+- errors_here = FALSE;
++ errors_here = false;
+
+ /*
+ * Now we have a line from the .rc file, wherever it's
+@@ -242,7 +242,7 @@
+ else {
+ fprintf(stderr, "%s: no key sequence after \"bind\" command"
+ " on line %d of "RCNAME, pname, lineno);
+- errors = TRUE;
++ errors = true;
+ continue;
+ }
+
+@@ -255,8 +255,8 @@
+ if (!*++q) {
+ fprintf(stderr, "%s: nothing follows `^' on line %d"
+ " of "RCNAME, pname, lineno);
+- errors = TRUE;
+- errors_here = TRUE;
++ errors = true;
++ errors_here = true;
+ } else {
+ *s++ = *q++ ^ 0x40;
+ }
+@@ -264,8 +264,8 @@
+ if (!*++q) {
+ fprintf(stderr, "%s: nothing follows `\\' on line %d"
+ " of "RCNAME, pname, lineno);
+- errors = TRUE;
+- errors_here = TRUE;
++ errors = true;
++ errors_here = true;
+ } else if (*q == '\\' || *q == '^') {
+ *s++ = *q++;
+ } else if (isxdigit((unsigned char)*q) &&
+@@ -278,8 +278,8 @@
+ } else {
+ fprintf(stderr, "%s: badly formed `\\' sequence on"
+ " line %d of "RCNAME, pname, lineno);
+- errors = TRUE;
+- errors_here = TRUE;
++ errors = true;
++ errors_here = true;
+ }
+ } else
+ *s++ = *q++;
+@@ -307,7 +307,7 @@
+ fprintf(stderr, "%s: unrecognised key action \"%s\""
+ " at line %d of "RCNAME"\n",
+ pname, r, lineno);
+- errors = TRUE;
++ errors = true;
+ }
+ } else if (!strcmp(q, "width")) {
+ width = atoi(r);
+@@ -317,7 +317,7 @@
+ fprintf(stderr, "%s: unrecognised "RCNAME" directive \"%s\""
+ " at line %d of "RCNAME"\n",
+ pname, q, lineno);
+- errors = TRUE;
++ errors = true;
+ }
+ }
+ if (errors)
+diff -Naur tweak-3.02/slang.c tweak-3.02.patched/slang.c
+--- tweak-3.02/slang.c 2016-03-22 17:12:51.000000000 -0400
++++ tweak-3.02.patched/slang.c 2021-09-07 14:21:21.918810299 -0400
+@@ -69,7 +69,7 @@
+ exit (1);
+ }
+ SLang_set_abort_signal (NULL);
+- SLtt_Use_Ansi_Colors = TRUE;
++ SLtt_Use_Ansi_Colors = true;
+
+ get_screen_size ();
+ if (SLsmg_init_smg () < 0) {
+@@ -109,7 +109,7 @@
+ SLsmg_write_nchars(str, len);
+ }
+
+-void display_define_colour(int colour, int fg, int bg, int reverse)
++void display_define_colour(int colour, int fg, int bg, bool reverse)
+ {
+ static char *colours[16] = {
+ "black", "red", "green", "brown",
+@@ -142,10 +142,15 @@
+
+ int display_getkey(void)
+ {
+- return SLang_getkey();
++ int key = SLang_getkey();
++ if (key == SLANG_GETKEY_ERROR) {
++ /* A failure to read from standard input is fatal */
++ exit(1);
++ }
++ return key;
+ }
+
+-int display_input_to_flush(void)
++bool display_input_to_flush(void)
+ {
+ return SLang_input_pending(0);
+ }
+@@ -153,7 +158,7 @@
+ void display_post_error(void)
+ {
+ SLKeyBoard_Quit = 0;
+- SLang_Error = 0;
++ SLang_set_error (0);
+ }
+
+ void display_recheck_size(void)
+diff -Naur tweak-3.02/tweak.h tweak-3.02.patched/tweak.h
+--- tweak-3.02/tweak.h 2016-03-22 17:12:51.000000000 -0400
++++ tweak-3.02.patched/tweak.h 2021-09-07 14:21:21.903810301 -0400
+@@ -16,12 +16,7 @@
+
+ #endif
+
+-#ifndef FALSE
+-#define FALSE 0
+-#endif
+-#ifndef TRUE
+-#define TRUE 1
+-#endif
++#include <stdbool.h>
+
+ #define EVER ;;
+
+@@ -80,23 +75,25 @@
+ extern char decstatus[], hexstatus[], *statfmt;
+ extern char last_char, *pname, *filename;
+ extern buffer *filedata, *cutbuffer;
+-extern int fix_mode, look_mode, insert_mode, edit_type, finished, marking;
++extern bool fix_mode, look_mode, insert_mode, finished, marking;
++extern int edit_type;
+ extern fileoffset_t file_size, top_pos, cur_pos, mark_point;
+-extern int scrlines, modified, new_file;
++extern int scrlines;
++extern bool modified, new_file;
+ extern fileoffset_t width, offset, realoffset;
+-extern int ascii_enabled;
++extern bool ascii_enabled;
+
+ #ifdef unix
+-extern volatile int safe_update, update_required;
++extern volatile bool safe_update, update_required;
+ extern void update (void);
+ #endif
+
+ extern void fix_offset(void);
+-extern fileoffset_t parse_num (char *buffer, int *error);
++extern fileoffset_t parse_num (char *buffer, bool *error);
+
+ extern void draw_scr (void);
+-extern int backup_file (void);
+-extern int save_file (void);
++extern bool backup_file (void);
++extern bool save_file (void);
+
+ extern void act_self_ins (void);
+ extern keyact parse_action (char *);
+@@ -107,7 +104,7 @@
+ extern Search *build_search (char *, int);
+ void free_search(Search *s);
+
+-extern int get_str (char *, char *, int);
++extern bool get_str (char *, char *, bool);
+ extern int parse_quoted (char *);
+ extern void suspend (void);
+
+@@ -137,11 +134,11 @@
+ extern void display_refresh(void);
+ extern void display_write_str(char *str);
+ extern void display_write_chars(char *str, int len);
+-extern void display_define_colour(int colour, int fg, int bg, int reverse);
++extern void display_define_colour(int colour, int fg, int bg, bool reverse);
+ extern void display_set_colour(int colour);
+ extern void display_clear_to_eol(void);
+ extern int display_getkey(void);
+-extern int display_input_to_flush(void);
++extern bool display_input_to_flush(void);
+ extern void display_post_error(void);
+ extern void display_recheck_size(void);
+
diff --git a/development/tweak/README b/development/tweak/README
index 532a13c0c9..f98032f016 100644
--- a/development/tweak/README
+++ b/development/tweak/README
@@ -1,4 +1,4 @@
-tweak (ncurses-based hex editor)
+tweak (ncurses-based hex editor, with emacs-like keybindings)
Tweak is a hex editor. It allows you to edit a file at very low level,
letting you see the full and exact binary contents of the file. It can
diff --git a/development/tweak/slack-desc b/development/tweak/slack-desc
index a86c024909..a30395cc3f 100644
--- a/development/tweak/slack-desc
+++ b/development/tweak/slack-desc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-tweak: tweak (ncurses-based hex editor)
+tweak: tweak (ncurses-based hex editor, with emacs-like keybindings)
tweak:
tweak: Tweak is a hex editor. It allows you to edit a file at very low
tweak: level, letting you see the full and exact binary contents of the
diff --git a/development/tweak/tweak.SlackBuild b/development/tweak/tweak.SlackBuild
index 20af16d924..ac63a2427c 100644
--- a/development/tweak/tweak.SlackBuild
+++ b/development/tweak/tweak.SlackBuild
@@ -6,10 +6,14 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210907 bkw: update for v3.02+20200601 (git commit ad97e13),
+# which has a few bugfixes. The patch does *not* include the last git
+# commit, d131fe2, which switches from a plain Makefile to autotools.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=tweak
-VERSION=${VERSION:-3.02}
+VERSION=${VERSION:-3.02+20200601}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +26,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
@@ -50,15 +51,20 @@ fi
set -e
+TARVER=${VERSION/+*}
+PATCH=${VERSION/*+}
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$TARVER
+tar xvf $CWD/$PRGNAM-$TARVER.tar.gz
+cd $PRGNAM-$TARVER
chown -R root:root .
chmod 644 *
+[ "$PATCH" != "$VERSION" ] && patch -p1 < $CWD/$PATCH.diff
+
make XFLAGS="$SLKCFLAGS"
install -D -s -m0755 $PRGNAM $PKG/usr/bin/$PRGNAM
mkdir -p $PKG/usr/man/man1
diff --git a/development/tweak/tweak.info b/development/tweak/tweak.info
index 96d13aaafd..3759a9378d 100644
--- a/development/tweak/tweak.info
+++ b/development/tweak/tweak.info
@@ -1,5 +1,5 @@
PRGNAM="tweak"
-VERSION="3.02"
+VERSION="3.02+20200601"
HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/tweak/"
DOWNLOAD="https://www.chiark.greenend.org.uk/~sgtatham/tweak/tweak-3.02.tar.gz"
MD5SUM="d50e20d9ed05d7cc5eb04ff3f0bf1d9b"
diff --git a/development/uncrustify/uncrustify.SlackBuild b/development/uncrustify/uncrustify.SlackBuild
index 1bdba50108..11775f081d 100644
--- a/development/uncrustify/uncrustify.SlackBuild
+++ b/development/uncrustify/uncrustify.SlackBuild
@@ -7,7 +7,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=uncrustify
-VERSION=${VERSION:-0.72.0}
+VERSION=${VERSION:-0.73.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/uncrustify/uncrustify.info b/development/uncrustify/uncrustify.info
index 359f2e8b83..238d8dd6c7 100644
--- a/development/uncrustify/uncrustify.info
+++ b/development/uncrustify/uncrustify.info
@@ -1,8 +1,8 @@
PRGNAM="uncrustify"
-VERSION="0.72.0"
+VERSION="0.73.0"
HOMEPAGE="http://uncrustify.sourceforge.net/"
-DOWNLOAD="https://github.com/uncrustify/uncrustify/archive/uncrustify-0.72.0/uncrustify-uncrustify-0.72.0.tar.gz"
-MD5SUM="9e89cd3457cb1b431eab5c7a161c02a2"
+DOWNLOAD="https://github.com/uncrustify/uncrustify/archive/uncrustify-0.73.0/uncrustify-uncrustify-0.73.0.tar.gz"
+MD5SUM="e62bfd39c978bedbaef0c7ea2485d80d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/unifdef/unifdef.SlackBuild b/development/unifdef/unifdef.SlackBuild
index 117cd76e59..ddb5632262 100644
--- a/development/unifdef/unifdef.SlackBuild
+++ b/development/unifdef/unifdef.SlackBuild
@@ -22,9 +22,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
diff --git a/development/unifdef/unifdef.info b/development/unifdef/unifdef.info
index df9a902bbd..f0e7235f8a 100644
--- a/development/unifdef/unifdef.info
+++ b/development/unifdef/unifdef.info
@@ -1,7 +1,7 @@
PRGNAM="unifdef"
VERSION="2.12"
-HOMEPAGE="http://dotat.at/prog/unifdef/"
-DOWNLOAD="http://dotat.at/prog/unifdef/unifdef-2.12.tar.xz"
+HOMEPAGE="https://dotat.at/prog/unifdef/"
+DOWNLOAD="https://dotat.at/prog/unifdef/unifdef-2.12.tar.xz"
MD5SUM="ae8c0b3b4c43c1f6bc5f32412a820818"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/development/vscode-bin/vscode-bin.SlackBuild b/development/vscode-bin/vscode-bin.SlackBuild
index 2d0dcf8ae7..3ecbb1884c 100644
--- a/development/vscode-bin/vscode-bin.SlackBuild
+++ b/development/vscode-bin/vscode-bin.SlackBuild
@@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=vscode-bin
SRCNAM=code-stable
-VERSION=${VERSION:-1.58.2}
-SRCVER=1626303100
+VERSION=${VERSION:-1.60.2}
+SRCVER=1632313902
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/vscode-bin/vscode-bin.info b/development/vscode-bin/vscode-bin.info
index 2b7210501d..508182fe78 100644
--- a/development/vscode-bin/vscode-bin.info
+++ b/development/vscode-bin/vscode-bin.info
@@ -1,10 +1,10 @@
PRGNAM="vscode-bin"
-VERSION="1.58.2"
+VERSION="1.60.2"
HOMEPAGE="https://code.visualstudio.com/"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://az764295.vo.msecnd.net/stable/c3f126316369cd610563c75b1b1725e0679adfb3/code-stable-x64-1626303100.tar.gz"
-MD5SUM_x86_64="90322599030b86c75e6a4fcc913f92e2"
+DOWNLOAD_x86_64="https://az764295.vo.msecnd.net/stable/7f6ab5485bbc008386c4386d08766667e155244e/code-stable-x64-1632313902.tar.gz"
+MD5SUM_x86_64="f37b0c232e6fba1c0deba39557dec0e2"
REQUIRES=""
MAINTAINER="Willy Sudiarto Raharjo"
EMAIL="willysr@slackbuilds.org"
diff --git a/development/wheel/doinst.sh b/development/wheel/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/development/wheel/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
diff --git a/development/wheel/wheel.SlackBuild b/development/wheel/wheel.SlackBuild
index ebd89329fa..42a2880153 100644
--- a/development/wheel/wheel.SlackBuild
+++ b/development/wheel/wheel.SlackBuild
@@ -95,7 +95,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/xa/xa.SlackBuild b/development/xa/xa.SlackBuild
index 69d96d8375..1f589f6483 100644
--- a/development/xa/xa.SlackBuild
+++ b/development/xa/xa.SlackBuild
@@ -47,9 +47,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
diff --git a/development/xa/xa.info b/development/xa/xa.info
index 6b872338ad..a92714acb0 100644
--- a/development/xa/xa.info
+++ b/development/xa/xa.info
@@ -1,6 +1,6 @@
PRGNAM="xa"
VERSION="2.3.11"
-HOMEPAGE="http://www.floodgap.com/retrotech/xa/"
+HOMEPAGE="https://www.floodgap.com/retrotech/xa/"
DOWNLOAD="https://slackware.uk/~urchlay/src/xa-2.3.11.tar.gz \
https://slackware.uk/~urchlay/src/dxa-0.1.4.tar.gz"
MD5SUM="72cbd5619f75b0c9839b90c41d0f9ea6 \
diff --git a/development/xasm/xasm.SlackBuild b/development/xasm/xasm.SlackBuild
index 90032d364c..3a0d316a5f 100644
--- a/development/xasm/xasm.SlackBuild
+++ b/development/xasm/xasm.SlackBuild
@@ -22,9 +22,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
@@ -46,11 +43,8 @@ rm -rf $PRGNAM-$PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
make install install-scite prefix=/usr mandir=/usr/man/man1 DESTDIR=$PKG
chmod 644 $PKG/usr/share/scite/$PRGNAM.properties
diff --git a/development/xdebug/slack-desc b/development/xdebug/slack-desc
deleted file mode 100644
index 9c76d1228e..0000000000
--- a/development/xdebug/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-xdebug: xdebug (A PHP extension for debuggin PHP scripts)
-xdebug:
-xdebug: The Xdebug extension helps you debugging your script by providing a
-xdebug: lot of valuable debug information. The debug information that Xdebug
-xdebug: can provide includes the following: stack traces and function traces
-xdebug: in error messages, memory allocation and protection for infinite
-xdebug: recursions. Xdebug also provides profiling information for PHP,
-xdebug: scripts, code coverage analysis and capabilities to debug PHP scripts
-xdebug: interactively with a debug client.
-xdebug:
-xdebug: Homepage: http://xdebug.org
diff --git a/development/xdebug/xdebug.ini b/development/xdebug/xdebug.ini
deleted file mode 100644
index 0b6e3310f0..0000000000
--- a/development/xdebug/xdebug.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-; Enable xdebug extension module
-;zend_extension="/usr/LIBDIR/php/extensions/xdebug.so"
diff --git a/development/xnedit/xnedit.SlackBuild b/development/xnedit/xnedit.SlackBuild
index 8720caec4b..514ba4fde1 100644
--- a/development/xnedit/xnedit.SlackBuild
+++ b/development/xnedit/xnedit.SlackBuild
@@ -28,7 +28,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=xnedit
-VERSION=${VERSION:-1.2.2}
+VERSION=${VERSION:-1.3.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/development/xnedit/xnedit.info b/development/xnedit/xnedit.info
index db1e781a84..528dad13b7 100644
--- a/development/xnedit/xnedit.info
+++ b/development/xnedit/xnedit.info
@@ -1,8 +1,8 @@
PRGNAM="xnedit"
-VERSION="1.2.2"
+VERSION="1.3.2"
HOMEPAGE="https://sourceforge.net/projects/xnedit/"
-DOWNLOAD="https://sourceforge.net/projects/xnedit/files/xnedit-1.2.2.tar.gz"
-MD5SUM="d38b1b2612a75c5e130987e2c032cf2d"
+DOWNLOAD="https://sourceforge.net/projects/xnedit/files/xnedit-1.3.2.tar.gz"
+MD5SUM="f15644256739b5b74638254c6f8a285e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/xtruss/slack-desc b/development/xtruss/slack-desc
index 60d904107a..ce92fca42d 100644
--- a/development/xtruss/slack-desc
+++ b/development/xtruss/slack-desc
@@ -9,7 +9,7 @@
xtruss: xtruss (easy to use X protocol tracing program)
xtruss:
xtruss: XTruss logs everything that passes between the X server and one
-xtruss: or more X client programs. In this it is similar to xmon(1), but
+xtruss: or more X client programs. In this it is similar to xmon(1), but
xtruss: intended to combine xmon's basic functionality with an interface
xtruss: much more similar to strace(1).
xtruss:
diff --git a/development/xtruss/xtruss.SlackBuild b/development/xtruss/xtruss.SlackBuild
index 288f7ed52c..f3ed5bd231 100644
--- a/development/xtruss/xtruss.SlackBuild
+++ b/development/xtruss/xtruss.SlackBuild
@@ -7,6 +7,9 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210907 bkw:
+# - update for v20210225.2addd50
+
# 20201102 bkw:
# - update for v20200918.a94a153
# - switch to self-hosted source, as upstream disappears the old source
@@ -15,7 +18,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=xtruss
-VERSION=${VERSION:-20200918.a94a153}
+VERSION=${VERSION:-20210225.2addd50}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -28,9 +31,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
diff --git a/development/xtruss/xtruss.info b/development/xtruss/xtruss.info
index 712b3b8ea7..702b527a53 100644
--- a/development/xtruss/xtruss.info
+++ b/development/xtruss/xtruss.info
@@ -1,8 +1,8 @@
PRGNAM="xtruss"
-VERSION="20200918.a94a153"
+VERSION="20210225.2addd50"
HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/xtruss/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/xtruss-20200918.a94a153.tar.gz"
-MD5SUM="bcdf1e92ec0f6226cd8a314edf861b62"
+DOWNLOAD="https://slackware.uk/~urchlay/src/xtruss-20210225.2addd50.tar.gz"
+MD5SUM="e8352df70de5b1938fa90ba6bb7e2ad2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/xvi/README b/development/xvi/README
index c64957a55f..45602cb234 100644
--- a/development/xvi/README
+++ b/development/xvi/README
@@ -3,7 +3,7 @@ xvi (tiny but full-featured vi clone)
Xvi is a portable multi-window version of the UNIX editor 'vi', derived
from "STEVIE" in the 1980s. The program was originally developed for the
Atari ST, but has been ported to many platforms. In spite of its name,
-there is, as yet, no X-Windows-specific version of it.
+there is, as yet, no X-Window-specific version of it.
It uses text windows separated by horizontal status lines on character
mode displays and the windows may represent different files being
diff --git a/development/xvi/slack-desc b/development/xvi/slack-desc
index 716119b75b..9c0b82fdaa 100644
--- a/development/xvi/slack-desc
+++ b/development/xvi/slack-desc
@@ -11,7 +11,7 @@ xvi:
xvi: Xvi is a portable multi-window version of the UNIX editor 'vi',
xvi: derived from "STEVIE" in the 1980s. The program was originally
xvi: developed for the Atari ST, but has been ported to many platforms. In
-xvi: spite of its name, there is, as yet, no X-Windows-specific version
+xvi: spite of its name, there is, as yet, no X-Window-specific version
xvi: of it.
xvi:
xvi: It uses text windows separated by horizontal status lines on character
diff --git a/development/xvi/xvi.SlackBuild b/development/xvi/xvi.SlackBuild
index 3d43484f2d..aee08d4181 100644
--- a/development/xvi/xvi.SlackBuild
+++ b/development/xvi/xvi.SlackBuild
@@ -22,9 +22,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
diff --git a/development/z88dk/z88dk.SlackBuild b/development/z88dk/z88dk.SlackBuild
index b85cd91a01..cb30f9220a 100644
--- a/development/z88dk/z88dk.SlackBuild
+++ b/development/z88dk/z88dk.SlackBuild
@@ -12,6 +12,8 @@
# of a release. I'll admit, my motivation for that will be that I want
# to have a C compiler that targets Pac-Man arcade hardware (the 1.99B
# release doesn't, current git does).
+# 20210907 bkw: the above TODO still stands, but I don't have time to do
+# it right now (gearing up for 15.0 release).
cd $(dirname $0) ; CWD=$(pwd)
@@ -29,9 +31,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
@@ -72,6 +71,7 @@ find . -type d -print0 | xargs -0 chmod 0755
chmod +x *.sh
# Sneaky ways to inject CFLAGS.
+SLKCFLAGS+=" -fcommon"
sed -i "s/CC=gcc/CC='gcc $SLKCFLAGS'/" build.sh
export CXX="g++ $SLKCFLAGS"
diff --git a/development/zeal/064aaa05d6a3ba4ba3cf648199a3109aba2f41fe.diff.gz b/development/zeal/064aaa05d6a3ba4ba3cf648199a3109aba2f41fe.diff.gz
new file mode 100644
index 0000000000..cdd05caed3
--- /dev/null
+++ b/development/zeal/064aaa05d6a3ba4ba3cf648199a3109aba2f41fe.diff.gz
Binary files differ
diff --git a/development/zeal/zeal.SlackBuild b/development/zeal/zeal.SlackBuild
index 55242739e8..2abe7cd64f 100644
--- a/development/zeal/zeal.SlackBuild
+++ b/development/zeal/zeal.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=zeal
VERSION=${VERSION:-0.6.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -73,6 +73,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
+# https://github.com/zealdocs/zeal/pull/1218
+zcat $CWD/064aaa05d6a3ba4ba3cf648199a3109aba2f41fe.diff.gz | patch -p1
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \