From owner-svn-ports-head@freebsd.org Thu Aug 16 21:04:02 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB57F1076DBC; Thu, 16 Aug 2018 21:04:02 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5E95E799D7; Thu, 16 Aug 2018 21:04:02 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3BCDB1ED03; Thu, 16 Aug 2018 21:04:02 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7GL4262022895; Thu, 16 Aug 2018 21:04:02 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7GL415m022894; Thu, 16 Aug 2018 21:04:01 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201808162104.w7GL415m022894@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Thu, 16 Aug 2018 21:04:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477376 - in head/editors/vim: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: in head/editors/vim: . files X-SVN-Commit-Revision: 477376 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2018 21:04:03 -0000 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