summaryrefslogtreecommitdiffstats
path: root/development/bmake
diff options
context:
space:
mode:
Diffstat (limited to 'development/bmake')
-rw-r--r--development/bmake/README2
-rw-r--r--development/bmake/bmake.SlackBuild31
-rw-r--r--development/bmake/bmake.info10
3 files changed, 29 insertions, 14 deletions
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 05f140d3e9..ddc09c7bab 100644
--- a/development/bmake/bmake.SlackBuild
+++ b/development/bmake/bmake.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for bmake
@@ -22,8 +22,13 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# Now maintained by B. Watson <yalhcru@gmail.com>
+# Now maintained by B. Watson <urchlay@slackware.uk>
+# 20230108 bkw: update for 20220928
+# 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
# 20170214 bkw:
@@ -33,10 +38,13 @@
# give you a parallel build, but it does break the 'make test'
# portion of the bmake build.
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=bmake
-VERSION=${VERSION:-20200212}
+VERSION=${VERSION:-20220928}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -46,7 +54,11 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -102,7 +114,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 \
@@ -116,8 +128,11 @@ mv $PKG/usr/share/mk $PKG/usr/share/mk-$PRGNAM
find -L $PKG -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
\! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-# Binary is already stripped. Only have one man page:
-gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+# Binary is already stripped. Only have one man page.
+# Oh FFS, 20201010 ignores MANTARGET, we get /usr/man/cat1.
+rm -rf $PKG/usr/man/*
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
head -n70 main.c > LICENSE
@@ -128,4 +143,4 @@ 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:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/bmake/bmake.info b/development/bmake/bmake.info
index 3430f1db55..c1a2973678 100644
--- a/development/bmake/bmake.info
+++ b/development/bmake/bmake.info
@@ -1,10 +1,10 @@
PRGNAM="bmake"
-VERSION="20200212"
-HOMEPAGE="http://www.crufty.net/help/sjg/bmake.htm"
-DOWNLOAD="http://www.crufty.net/ftp/pub/sjg/bmake-20200212.tar.gz"
-MD5SUM="20a917552baf266f4434d97a2ddb7daa"
+VERSION="20220928"
+HOMEPAGE="https://www.crufty.net/help/sjg/bmake.htm"
+DOWNLOAD="https://www.crufty.net/ftp/pub/sjg/bmake-20220928.tar.gz"
+MD5SUM="71889f3ab749e3f581b2f29b03ddad1e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"