svn commit: r477376 - in head/editors/vim: . files

[Adam Weinberger]

Author: adamw
Date: Thu Aug 16 21:04:01 2018
New Revision: 477376
URL: https://svnweb.freebsd.org/changeset/ports/477376

Log:
  Improve the way vim looks for python binaries
  
  Previously, we patched in the names of all the python binary versions, but
  I have been doing a terrible job of keeping them up-to-date. Instead, just
  tell vim's configure script the path to the binary we're using.
  
  This will fix building against python 3.7.
  
  PR:		230675
  Reported by:	Kamigishi Rei
  MFH:		2018Q3

Modified:
  head/editors/vim/Makefile
  head/editors/vim/files/patch-src-auto-configure

Modified: head/editors/vim/Makefile
==============================================================================
--- head/editors/vim/Makefile	Thu Aug 16 21:00:48 2018	(r477375)
+++ head/editors/vim/Makefile	Thu Aug 16 21:04:01 2018	(r477376)
@@ -129,10 +129,12 @@ PERL_CONFIGURE_ENABLE=	perlinterp
 PERL_USES=		perl5
 
 PYTHON2_CONFIGURE_ENABLE=	pythoninterp
+PYTHON2_CONFIGURE_WITH=	python-command=${LOCALBASE}/bin/python${PYTHON2_DEFAULT}
 PYTHON2_BUILD_DEPENDS=	python${PYTHON2_DEFAULT}:lang/python${PYTHON2_DEFAULT:S/.//}
 PYTHON2_RUN_DEPENDS=	${PYTHON2_BUILD_DEPENDS}
 
 PYTHON3_CONFIGURE_ENABLE=	python3interp
+PYTHON3_CONFIGURE_WITH=	python3-command=${PYTHON_CMD}
 PYTHON3_USES=		python:3.4+
 
 RUBY_CONFIGURE_ENABLE=	rubyinterp

Modified: head/editors/vim/files/patch-src-auto-configure
==============================================================================
--- head/editors/vim/files/patch-src-auto-configure	Thu Aug 16 21:00:48 2018	(r477375)
+++ head/editors/vim/files/patch-src-auto-configure	Thu Aug 16 21:04:01 2018	(r477376)
@@ -46,21 +46,3 @@
      fi
      if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
         test "x$MACOS_X" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
-@@ -6230,7 +6231,7 @@ fi
- 
- 
-   if test "X$vi_cv_path_python" = "X"; then
--    for ac_prog in python2 python
-+    for ac_prog in python2.7
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -6580,7 +6581,7 @@ fi
- 
- 
-   if test "X$vi_cv_path_python3" = "X"; then
--    for ac_prog in python3 python
-+    for ac_prog in python3.6 python3.5 python3.4
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2