diff options
| author | morr <morr> | 2015-07-04 12:54:51 +0000 |
|---|---|---|
| committer | morr <morr> | 2015-07-04 12:54:51 +0000 |
| commit | 0a585188bbbbf301de151bf08f97219e607ce06a (patch) | |
| tree | 0a72c2515cdac9c1c887237ea3da24e154495d09 /editors | |
| parent | 622340b97db089ce7435a469a08368c058fd0e08 (diff) | |
| download | pkgsrc-0a585188bbbbf301de151bf08f97219e607ce06a.tar.gz | |
Add two patches from Ben Batha:
The first patch fixes the lua option, so that vim-share can build with lua
support on platforms with lua in a non-default location.
The second patch adds support for building luajit into vim-share.
Thanks!
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/vim-share/Makefile | 3 | ||||
| -rw-r--r-- | editors/vim-share/options.mk | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile index 83fa7ec11bd..9e380d2b6be 100644 --- a/editors/vim-share/Makefile +++ b/editors/vim-share/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2015/07/04 12:46:30 morr Exp $ +# $NetBSD: Makefile,v 1.38 2015/07/04 12:54:51 morr Exp $ PKGNAME= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL} +PKGREVISION= 1 COMMENT= Data files for the vim editor (vi clone) .include "Makefile.common" diff --git a/editors/vim-share/options.mk b/editors/vim-share/options.mk index c7f4631f786..ea437c3967a 100644 --- a/editors/vim-share/options.mk +++ b/editors/vim-share/options.mk @@ -1,6 +1,6 @@ -# $NetBSD: options.mk,v 1.4 2015/01/02 12:32:13 morr Exp $ +# $NetBSD: options.mk,v 1.5 2015/07/04 12:54:51 morr Exp $ -PKG_SUPPORTED_OPTIONS+= ruby python perl lua +PKG_SUPPORTED_OPTIONS+= ruby python perl lua luajit PKG_OPTIONS_VAR= PKG_OPTIONS.vim .include "../../mk/bsd.options.mk" @@ -25,5 +25,10 @@ CONFIGURE_ENV+= vi_cv_path_perl=${PERL5} .if !empty(PKG_OPTIONS:Mlua) .include "../../lang/lua/buildlink3.mk" -CONFIGURE_ARGS+= --enable-luainterp +CONFIGURE_ARGS+= --enable-luainterp --with-lua-prefix=${PREFIX} +.endif + +.if !empty(PKG_OPTIONS:Mluajit) +.include "../../lang/LuaJIT2/buildlink3.mk" +CONFIGURE_ARGS+= --enable-luainterp --with-lua-prefix=${PREFIX} --with-luajit .endif |