[crux-commits] ports/contrib (refs/remotes/origin/3.6): bmake: update to 2021-01-10 (plus tweaks)

crux at crux.nu crux at crux.nu
Sat Apr 10 19:05:53 UTC 2021


commit 99bbe029d4c158fd9d8bf416952af93e6cc8e41d
Author: Steffen Nurpmeso <steffen at sdaoden.eu>
Date:   Mon Feb 8 23:50:53 2021 +0100

    bmake: update to 2021-01-10 (plus tweaks)

diff --git a/bmake/.signature b/bmake/.signature
index fea680761..e39834b31 100644
--- a/bmake/.signature
+++ b/bmake/.signature
@@ -1,7 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32LqA2elCV2vT9G5Qkh+9h6JWPasSBzWIYCVofyUBcKVgnlWz8UUU9YZvJiDfPCE1Wni8iAhtCwoLXNohpa05A4=
-SHA256 (Pkgfile) = 25f29486032c3a522ffbbd5dace4466ea71e4c08d2e33c2d98883c566ceb9446
+RWSagIOpLGJF3zdW+Pj07qWUm/RWRWx/bAxLHgPXbw+cHHLV9Jea+zre3AKI1s8st9C+04co4w5cFxesnOykoHOr5qG8+apYdwk=
+SHA256 (Pkgfile) = fb3fe1af6aa97ab0328b8b7fde788dd6864d687202df02ebe0aef6e90ebe53fd
 SHA256 (.footprint) = 2d6e83e9f38f0ca1ab19a1e945a247fee040d11f75aa324bb4fc21222a9f1f2e
-SHA256 (bmake-20201212.tar.gz) = 7027e8533f1313cdbf17a9806256068cb6286440e76e0518d77d96aa062bf242
+SHA256 (bmake-20210110.tar.gz) = 919ae7674a698ba900666d16e2a759e0d380b5d2ae41729e3b70d72519c636cb
 SHA256 (u-t-makefile.patch) = 5a504adb00ca5966a17d5046f257773591d0e1cc4d1fb2ff62130cdec5ccc10f
-SHA256 (simon.patch) = 13adb9f7b390d001bb656f2cc7e2b49e2dc7ae29bcb5ba0f347f4aac5b5c4615
diff --git a/bmake/Pkgfile b/bmake/Pkgfile
index 5d91ffcb1..c722c37ff 100644
--- a/bmake/Pkgfile
+++ b/bmake/Pkgfile
@@ -3,16 +3,15 @@
 # Maintainer:  Steffen Nurpmeso, steffen at sdaoden dot eu
 
 name=bmake
-version=20201212
+version=20210110
 release=2
-source=(http://www.crufty.net/ftp/pub/sjg/$name-$version.tar.gz
-   u-t-makefile.patch simon.patch)
+source=(http://www.crufty.net/ftp/pub/sjg/${name}-${version}.tar.gz
+   u-t-makefile.patch)
 
 build() {
-   cd $name
+   cd ${name}
 
-   patch -p0 < ../u-t-makefile.patch
-   patch -p1 < ../simon.patch
+   patch -p0 < "${SRC}"/u-t-makefile.patch
 
    mkdir -p build
    cd build
@@ -20,12 +19,12 @@ build() {
    sh ../boot-strap --with-default-sys-path=/usr/share/mk
    sh ../boot-strap --prefix=/usr \
       --with-mksrc=/usr/share/mk \
-      --install-destdir="$PKG" op=install
+      --install-destdir="${PKG}" op=install
 
-   chmod g-w "$PKG"/usr/bin "$PKG"/usr/share/mk
-   rm -rf "$PKG"/usr/share/man/cat1
-   mkdir "$PKG"/usr/share/man/man1
-   cp ../bmake.1 "$PKG"/usr/share/man/man1/
+   chmod g-w "${PKG}"/usr/bin "${PKG}"/usr/share/mk
+   rm -rf "${PKG}"/usr/share/man/cat1
+   mkdir "${PKG}"/usr/share/man/man1
+   cp ../bmake.1 "${PKG}"/usr/share/man/man1/
 }
 
 # s-sh-mode
diff --git a/bmake/simon.patch b/bmake/simon.patch
deleted file mode 100644
index b0211dfc9..000000000
--- a/bmake/simon.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Napru bmake.orig/mk/sys.mk bmake/mk/sys.mk
---- bmake.orig/mk/sys.mk	2020-08-19 19:52:06.000000000 +0200
-+++ bmake/mk/sys.mk	2020-12-22 20:24:45.701882157 +0100
-@@ -119,7 +119,7 @@ unix ?= We run ${_HOST_OSNAME}.
- 
- # We need a Bourne/POSIX shell
- MAKE_SHELL ?= sh
--SHELL ?= ${MAKE_SHELL}
-+SHELL := ${.SHELL}
- 
- # A race condition in mkdir, means that it can bail if another
- # process made a dir that mkdir expected to.


More information about the crux-commits mailing list