Received: by mail.netbsd.org (Postfix, from userid 605) id 241CD84D3F; Tue, 30 Jun 2020 18:49:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A212184D2D for ; Tue, 30 Jun 2020 18:49:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ZODj606EXRlu for ; Tue, 30 Jun 2020 18:49:57 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 020D584C8B for ; Tue, 30 Jun 2020 18:49:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F395EFB28; Tue, 30 Jun 2020 18:49:56 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159354299699550" MIME-Version: 1.0 Date: Tue, 30 Jun 2020 18:49:56 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/editors/vim-share To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200630184956.F395EFB28@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. --_----------=_159354299699550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Jun 30 18:49:56 UTC 2020 Modified Files: pkgsrc/editors/vim-share: options.mk Log Message: vim-share: Fix lua option. Instead of the first unversioned lua interpreter being detected (on NetBSD usually /usr/bin/lua), make sure the correct version as selected by pkgsrc infrastructure gets used. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/editors/vim-share/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_159354299699550 Content-Disposition: inline Content-Length: 1269 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/vim-share/options.mk diff -u pkgsrc/editors/vim-share/options.mk:1.8 pkgsrc/editors/vim-share/options.mk:1.9 --- pkgsrc/editors/vim-share/options.mk:1.8 Sat Nov 2 19:57:01 2019 +++ pkgsrc/editors/vim-share/options.mk Tue Jun 30 18:49:56 2020 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.8 2019/11/02 19:57:01 tnn Exp $ +# $NetBSD: options.mk,v 1.9 2020/06/30 18:49:56 nia Exp $ PKG_SUPPORTED_OPTIONS+= ruby python perl lua luajit PKG_OPTIONS_VAR= PKG_OPTIONS.vim @@ -29,11 +29,19 @@ CONFIGURE_ENV+= vi_cv_path_perl=${PERL5 .endif .if !empty(PKG_OPTIONS:Mlua) +LUA_VERSIONS_ACCEPTED= 53 52 51 .include "../../lang/lua/buildlink3.mk" -CONFIGURE_ARGS+= --enable-luainterp +CONFIGURE_ARGS+= --enable-luainterp +CONFIGURE_ARGS+= --with-lua-prefix=${BUILDLINK_PREFIX.lua} +CONFIGURE_ENV+= vi_cv_path_plain_lua=${LUA_INTERPRETER} +# pkgsrc has include/lua-5.x instead of include/lua5.x +SUBST_CLASSES+= lua +SUBST_FILES.lua= auto/configure +SUBST_STAGE.lua= pre-configure +SUBST_SED.lua= -e "s,include/lua,include/lua-,g" .endif .if !empty(PKG_OPTIONS:Mluajit) .include "../../lang/LuaJIT2/buildlink3.mk" -CONFIGURE_ARGS+= --enable-luainterp --with-luajit +CONFIGURE_ARGS+= --enable-luainterp --with-luajit .endif --_----------=_159354299699550--