Received: by mail.netbsd.org (Postfix, from userid 605) id E506584D74; Thu, 18 Jun 2020 10:07:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6E78284D71 for ; Thu, 18 Jun 2020 10:07:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id jOm9VQbvwMU2 for ; Thu, 18 Jun 2020 10:07:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C688584D3A for ; Thu, 18 Jun 2020 10:07:35 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C0177FB28; Thu, 18 Jun 2020 10:07:35 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159247485587300" MIME-Version: 1.0 Date: Thu, 18 Jun 2020 10:07:35 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/devel/bmake To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20200618100735.C0177FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_159247485587300 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Thu Jun 18 10:07:35 UTC 2020 Modified Files: pkgsrc/devel/bmake: Makefile Log Message: bmake: Fix match for bootstrap pdksh. When bmake is built during bootstrap it's using a temporary prefix, so matching against LOCALBASE doesn't work. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 pkgsrc/devel/bmake/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_159247485587300 Content-Disposition: inline Content-Length: 793 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/bmake/Makefile diff -u pkgsrc/devel/bmake/Makefile:1.77 pkgsrc/devel/bmake/Makefile:1.78 --- pkgsrc/devel/bmake/Makefile:1.77 Fri Jun 12 16:01:36 2020 +++ pkgsrc/devel/bmake/Makefile Thu Jun 18 10:07:35 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2020/06/12 16:01:36 jperkin Exp $ +# $NetBSD: Makefile,v 1.78 2020/06/18 10:07:35 jperkin Exp $ DISTNAME= bmake-20200524 PKGREVISION= 1 @@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSC # .if ${OPSYS} == "SunOS" && exists(/usr/bin/bash) CONFIGURE_ARGS+= --with-defshell=/usr/bin/bash -.elif ${TOOLS_PLATFORM.sh} == "${LOCALBASE}/bin/pdksh" +.elif ${TOOLS_PLATFORM.sh:M*/bin/pdksh} DEPENDS+= pdksh-[0-9]*:../../shells/pdksh CONFIGURE_ARGS+= --with-defshell=${PREFIX}/bin/pdksh .endif --_----------=_159247485587300--