Received: by mail.netbsd.org (Postfix, from userid 605) id ECBCF84DC0; Mon, 18 Feb 2019 14:10:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 73C6684D88 for ; Mon, 18 Feb 2019 14:10:38 +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 Ya9ergpnkfk4 for ; Mon, 18 Feb 2019 14:10:38 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id F202384CD0 for ; Mon, 18 Feb 2019 14:10:37 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id ED199FB16; Mon, 18 Feb 2019 14:10:37 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_155049903776770" MIME-Version: 1.0 Date: Mon, 18 Feb 2019 14:10:37 +0000 From: "Benny Siegert" Subject: CVS commit: pkgsrc/mk/configure To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20190218141037.ED199FB16@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. --_----------=_155049903776770 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Mon Feb 18 14:10:37 UTC 2019 Modified Files: pkgsrc/mk/configure: replace-interpreter.mk Log Message: replace-interpreter.mk: support REPLACE_PERL6. This is basically the same as REPLACE_PERL, except that there is a default for ${PERL6} inline if it is not otherwise defined. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 pkgsrc/mk/configure/replace-interpreter.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_155049903776770 Content-Disposition: inline Content-Length: 1565 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/configure/replace-interpreter.mk diff -u pkgsrc/mk/configure/replace-interpreter.mk:1.16 pkgsrc/mk/configure/replace-interpreter.mk:1.17 --- pkgsrc/mk/configure/replace-interpreter.mk:1.16 Tue Apr 17 09:31:41 2018 +++ pkgsrc/mk/configure/replace-interpreter.mk Mon Feb 18 14:10:37 2019 @@ -1,4 +1,4 @@ -# $NetBSD: replace-interpreter.mk,v 1.16 2018/04/17 09:31:41 adam Exp $ +# $NetBSD: replace-interpreter.mk,v 1.17 2019/02/18 14:10:37 bsiegert Exp $ # This file provides common templates for replacing #! interpreters # in script files. @@ -10,6 +10,7 @@ # REPLACE_CSH # REPLACE_KSH # REPLACE_PERL +# REPLACE_PERL6 # REPLACE_SH # Lists of files relative to WRKSRC in which the #! interpreter # should be replaced by the pkgsrc one. If any directories @@ -84,6 +85,14 @@ REPLACE.sys-Perl.new= ${PERL5} REPLACE_FILES.sys-Perl= ${REPLACE_PERL} .endif +.if !empty(REPLACE_PERL6:M*) +PERL6?= ${PREFIX}/bin/perl6 +REPLACE_INTERPRETER+= sys-Perl6 +REPLACE.sys-Perl6.old= .*perl6[^[:space:]]* +REPLACE.sys-Perl6.new= ${PERL6} +REPLACE_FILES.sys-Perl6=${REPLACE_PERL6} +.endif + .if !empty(REPLACE_SH:M*) REPLACE_INTERPRETER+= sys-sh REPLACE.sys-sh.old= [^[:space:]]*sh @@ -125,7 +134,7 @@ replace-interpreter: .endfor _VARGROUPS+= interp -.for varname in REPLACE_AWK REPLACE_BASH REPLACE_CSH REPLACE_KSH REPLACE_PERL REPLACE_SH +.for varname in REPLACE_AWK REPLACE_BASH REPLACE_CSH REPLACE_KSH REPLACE_PERL REPLACE_PERL6 REPLACE_SH _PKG_VARS.interp+= ${varname} .endfor _PKG_VARS.interp+= REPLACE_INTERPRETER --_----------=_155049903776770--