bosh: Patch for NetBSD od removed (workaround merged upstream)

[Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Thu Sep 27 14:54:35 2018 +0200
Changeset:	4179677a7039093dfca09526189c3f5bfe667919

Modified Files:
	bosh/Makefile
	bosh/TODO
	bosh/distinfo

Log Message:
bosh: Patch for NetBSD od removed (workaround merged upstream)

Updated to schilytools-2018-09-26

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4179677a7039093dfca09526189c3f5bfe667919

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 bosh/Makefile | 16 +++++-----------
 bosh/TODO     |  2 ++
 bosh/distinfo |  8 ++++----
 3 files changed, 11 insertions(+), 15 deletions(-)

diffs:
diff --git a/bosh/Makefile b/bosh/Makefile
index 0b9bc67889..28339eeda0 100644
--- a/bosh/Makefile
+++ b/bosh/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
-DISTNAME=	schily-2018-09-04
-PKGNAME=	${DISTNAME:S/schily/bosh/}
+DISTNAME=	schily-2018-09-26
+PKGNAME=	bosh-20160524
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=schilytools/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,25 +13,19 @@ LICENSE=	cddl-1.0
 
 MAKE_JOBS_SAFE=	no
 
-USE_TOOLS+=	smake tbl
+USE_TOOLS+=	gmake tbl
+MAKE_FLAGS+=	GMAKE_NOWARN=true
 
 PKG_SHELL=	bin/bosh
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.prefs.mk"
 
-# Fix testsuite (NetBSD od creates whitespace at the end of output lines)
-SUBST_CLASSES+=		od
-SUBST_STAGE.od=		post-patch
-SUBST_FILES.od=		sh/tests/shelltests/printf/printf.sh
-SUBST_SED.od=		-e "s,-e \\\\\"s/\^\[ 	]\*//\\\[\"],-e \\\\\"s/^[ 	]*//\\\\\" -e \\\\\"s/[ 	]*$$//\\\\\",g"
-SUBST_MESSAGE.od=	Fix processing of output from od.
-
 # Shared platform specific hacks for schilytools (provided by smake package)
 .include "../../wip/smake/Makefile.common"
 
 do-configure:
-	cd ${WRKSRC}/inc && MAKEFLAGS=${MAKEFLAGS:S/:_MAKE/_PKGSRC_MAKE/} ${MAKE_PROGRAM} ${MAKE_FLAGS}
+	cd ${WRKSRC}/inc && ${MAKE_PROGRAM} ${MAKE_FLAGS}
 
 do-build:
 	cd ${WRKSRC} && for library in					\
diff --git a/bosh/TODO b/bosh/TODO
index 6a82c308c6..bc37453556 100644
--- a/bosh/TODO
+++ b/bosh/TODO
@@ -2,7 +2,9 @@
     Reason: NetBSD od has trailing whitespace in its output
     => Fix added for current version
     => Reported to upstream, next release will contain a workaround
+    => Updated to release 2018-09-26 and patch removed
 [X] Analyze keyboard behaviour for Delete and Backspace
     => Different behaviour (compared to ash and bash) is documented
 [X] Add obosh and pbosh variants to this package?
     => No, use separate packages
+[ ] Use smake for build
diff --git a/bosh/distinfo b/bosh/distinfo
index 99ef37fb31..f797e286dc 100644
--- a/bosh/distinfo
+++ b/bosh/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (schily-2018-09-04.tar.bz2) = bc1f86abd2269261c004488ed4b7fd6384200857
-RMD160 (schily-2018-09-04.tar.bz2) = f565288e1da41277111593447a5f17bd9b129ff5
-SHA512 (schily-2018-09-04.tar.bz2) = c0a8f638c31534589cb3ca3e98ca611639ad817bb4ce7147d06c5c946f16b087073d6df28d0c6f8e24ff2a87c92e88e83a9b01620e6fa7bf1303804ca1c25a97
-Size (schily-2018-09-04.tar.bz2) = 4294348 bytes
+SHA1 (schily-2018-09-26.tar.bz2) = 41693b863f5badc96f23f8c8f83390fbe7df539e
+RMD160 (schily-2018-09-26.tar.bz2) = 2c8a70c712960a3f77c0faf632bf9d76969a5518
+SHA512 (schily-2018-09-26.tar.bz2) = 5670bee370ca9408ebb827f5017f2d1505d25c2981c70bfe5e8e8648beba4228d778c2290ce623dcc9361a752e977cccf40b3174598e0a1c616171ce79af5885
+Size (schily-2018-09-26.tar.bz2) = 4297286 bytes