Sunday, August 27, 2017

Make vim ruby FLAVOR use default ruby version

This makes vim use the default ruby version instead of ruby 1.8.

Briefly tested on amd64 using examples on
http://vimdoc.sourceforge.net/htmldoc/if_ruby.html

All of the following still build:

SUBDIR += vim,gtk2,perl,python,ruby
SUBDIR += vim,gtk2,perl,python3,ruby
SUBDIR += vim,no_x11,perl,python,ruby
SUBDIR += vim,no_x11,perl,python3,ruby

This also changes autoconf to run during pre-configure instead of
post-patch, since I think that is the current recommended place as
it allows you to run make patch, modify configure.ac, and then
run make configure.

OKs?

Thanks,
Jeremy

Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/vim/Makefile,v
retrieving revision 1.161
diff -u -p -r1.161 Makefile
--- Makefile 23 Aug 2017 19:10:56 -0000 1.161
+++ Makefile 27 Aug 2017 23:58:45 -0000
@@ -14,6 +14,8 @@ PKGNAME-lang= vim-lang-$V
P= vim${V:R:S/.//}
CATEGORIES= editors

+REVISION-main= 0
+
HOMEPAGE= http://www.vim.org/

# donation-ware
@@ -91,7 +93,6 @@ ERRORS= "Fatal: You only can select one

.if ${FLAVOR:Mruby}
MODULES+= lang/ruby
-MODRUBY_REV= 1.8
CONFIGURE_ARGS+= --enable-rubyinterp --with-ruby-command=${RUBY}
LIB_DEPENDS+= ${MODRUBY_LIB_DEPENDS}
WANTLIB+= m ${MODRUBY_WANTLIB}
@@ -149,7 +150,7 @@ WRKSRC= ${WRKDIST}/src
SUBST_VARS= P

# CONFIGURE_STYLE=autoconf doesn't work
-post-patch:
+pre-configure:
cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} autoconf

post-configure:

No comments:

Post a Comment