shells/bosh: Update to 2020-05-25

- Use OS specific helper code from devel/smake/Makefile.common

Changes from AN-2020-05-25:
-       libmdgest: Added a "defined(_M_ARM)" check for MSVC byte order
        definitions (byte_order.h).

        Thanks to "Excalibur" for reporting.

-       Bourne Shell: The unit tests for the ERR trap did not work on NetBSD
        because /bin/false does not exists on NetBSD. We now first check
        for /bin/false and /usr/bin/false and use what's available.

        Thanks to Michael Bäuerle from pkgsrc for reporting.

2 files changed, 19 insertions, 15 deletions

diff --git a/shells/bosh/Makefile b/shells/bosh/Makefile
index c46d7e7fbe8..c54b69d13d1 100644
--- a/shells/bosh/Makefile
+++ b/shells/bosh/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2020/05/11 16:52:07 micha Exp $
+# $NetBSD: Makefile,v 1.12 2020/06/05 17:20:52 micha Exp $
 
-DISTNAME=	schily-2020-05-11
-PKGNAME=	bosh-20200511
+DISTNAME=	schily-2020-05-25
+PKGNAME=	bosh-20200525
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=schilytools/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,9 +13,8 @@ LICENSE=	cddl-1.0
 
 MAKE_JOBS_SAFE=	no
 
-# tbl(1) of NetBSD 9 can't process the man page, but man(1) can.
-# Install man page with unprocessed tables as workaround (may break other OS)
-#USE_TOOLS+=	tbl
+.include "../../mk/bsd.prefs.mk"
+
 TOOL_DEPENDS+=	smake-[0-9]*:../../devel/smake
 SMAKE=		MAKEFLAGS= smake
 MAKE_FLAGS+=	DESTDIR=${DESTDIR} INS_BASE=${PREFIX} DEFMANBASE=. MANDIR=${PKGMANDIR}
@@ -26,14 +25,16 @@ PKG_SHELL=		bin/bosh
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 # Only required for testsuite
+# This is a temporary workaround for NetBSD. Next release will contain some
+# test logic and this can be removed again
+.if ${OPSYS} == "NetBSD"
 SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		pre-test
 SUBST_MESSAGE.fix-paths=	Fixing absolute paths for true and false.
 SUBST_FILES.fix-paths=		sh/tests/shelltests/trap/trap.sh
 SUBST_SED.fix-paths=		-e 's,/bin/true,/usr/bin/true,g'
 SUBST_SED.fix-paths+=		-e 's,/bin/false,/usr/bin/false,g'
-
-.include "../../mk/bsd.prefs.mk"
+.endif
 
 # Shared platform specific code for schilytools (provided by smake package)
 .include "../../devel/smake/Makefile.common"
@@ -51,9 +52,12 @@ do-build:
 
 # Process tables in manpage
 post-build:
+.if !empty(USE_TOOLS:Mtbl)
+	cd ${WRKSRC} && ${TBL} sh/sh.1 >sh/bosh.1.tmp;			\
+		${MV} -f sh/bosh.1.tmp sh/bosh.1
+.else
 	cd ${WRKSRC} && ${MV} -f sh/sh.1 sh/bosh.1
-#	cd ${WRKSRC} && ${TBL} sh/sh.1 >sh/bosh.1.tmp;			\
-#		${MV} -f sh/bosh.1.tmp sh/bosh.1
+.endif
 
 do-test:
 	cd ${WRKSRC}/sh &&						\
diff --git a/shells/bosh/distinfo b/shells/bosh/distinfo
index 386246a9f21..e517d1a2c57 100644
--- a/shells/bosh/distinfo
+++ b/shells/bosh/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2020/05/11 16:52:07 micha Exp $
+$NetBSD: distinfo,v 1.10 2020/06/05 17:20:52 micha Exp $
 
-SHA1 (schily-2020-05-11.tar.bz2) = 1992e23344880fb58443c5b89b24fded4039f7a7
-RMD160 (schily-2020-05-11.tar.bz2) = bdf3ac0349f00095d7e17f1b14a07f6dcb94a0e2
-SHA512 (schily-2020-05-11.tar.bz2) = a12f0a3caa14c35af150afb4354fbe7c5b1d6ad301d24efbed6f0ec7c38919fe2bf863a117d46107178d11f60b9dd93f72f173c722e2e129d86d348b01fc56ee
-Size (schily-2020-05-11.tar.bz2) = 4783976 bytes
+SHA1 (schily-2020-05-25.tar.bz2) = ba4f353ab3c3ecded4c417e8601f6986717508a9
+RMD160 (schily-2020-05-25.tar.bz2) = 56f9a9812f26ff80699bb1e5ed299e24a724ff18
+SHA512 (schily-2020-05-25.tar.bz2) = 73079c7c9c724911af10e641dfd82fb900c434c59a1d30fa34ac69f7f3e31dfe050cf718621574ce54cf5eb7189f32a5894fe070115c7eabc13c65e00b010b3b
+Size (schily-2020-05-25.tar.bz2) = 4794851 bytes