Date: Tue, 4 Feb 2020 14:03:01 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525167 - in head: . editors/vim Message-ID: <202002041403.014E31Vq053126@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Tue Feb 4 14:03:00 2020 New Revision: 525167 URL: https://svnweb.freebsd.org/changeset/ports/525167 Log: vim: Update to patchlevel 205 and add PYTHON option When python is built with DEBUG, vim fails to build. In fixing this case, note that vim will now fail to build if python or vim is build with DEBUG and the other isn't. This also highlighted that python support is being kludged. The PYTHON2 and PYTHON3 options have been combined into a single PYTHON option that builds with the default python. Consequently, it is no longer possible to build vim with both py2 and py3 support. I can't name any modern high-usage python-based plugin that requires 2.7, so hopefully this only messes up things for a very small minority. Thanks to koobs for the prompt to combine these options. I've been wanting to do this for a while now. PR: 243606 Submitted by: novel Modified: head/UPDATING head/editors/vim/Makefile head/editors/vim/distinfo Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Feb 4 13:48:35 2020 (r525166) +++ head/UPDATING Tue Feb 4 14:03:00 2020 (r525167) @@ -5,6 +5,15 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20200204: + AFFECTS: users of editors/vim + AUTHOR: adamw@FreeBSD.org + + The PYTHON2 and PYTHON3 options have been turned into a single PYTHON + option that uses whichever python you've set as default. However, + this means that you cannot have both python2 and python3 support at + the same time. + 20200126: AFFECTS: users of multimedia/gstreamer1-plugins[-bad] AUTHOR: kwm@freebsd.org Modified: head/editors/vim/Makefile ============================================================================== --- head/editors/vim/Makefile Tue Feb 4 13:48:35 2020 (r525166) +++ head/editors/vim/Makefile Tue Feb 4 14:03:00 2020 (r525167) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vim -PORTVERSION= 8.2.0076 +PORTVERSION= 8.2.0205 DISTVERSIONPREFIX= v CATEGORIES= editors @@ -37,13 +37,13 @@ VIM_VER= ${PORTNAME}${PORTVERSION:R:S|.||g} # OPTIONS # ### Make sure any new options are excluded below in CONSOLE/TINY -OPTIONS_DEFAULT= CSCOPE DEFAULT_VIMRC CTAGS_EXUBERANT GTK3 PERL PYTHON3 RUBY +OPTIONS_DEFAULT= CSCOPE DEFAULT_VIMRC CTAGS_EXUBERANT GTK3 PERL PYTHON RUBY OPTIONS_DEFINE= CSCOPE DEFAULT_VIMRC MAKE_JOBS NLS XTERM_SAVE OPTIONS_SINGLE= CTAGS UI OPTIONS_SINGLE_CTAGS= CTAGS_BASE CTAGS_EXUBERANT CTAGS_UNIVERSAL OPTIONS_SINGLE_UI= ATHENA CONSOLE GNOME GTK2 GTK3 MOTIF X11 OPTIONS_GROUP= LANGBIND -OPTIONS_GROUP_LANGBIND= LUA PERL PYTHON2 PYTHON3 RUBY SCHEME TCL +OPTIONS_GROUP_LANGBIND= LUA PERL PYTHON RUBY SCHEME TCL OPTIONS_SUB= yes .if defined(CONSOLE) || defined(TINY) @@ -133,15 +133,8 @@ LUA_USES= lua 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} +PYTHON_USES= python -PYTHON3_CONFIGURE_ENABLE= python3interp -PYTHON3_CONFIGURE_WITH= python3-command=${PYTHON_CMD} -PYTHON3_USES= python:3.4+ - RUBY_CONFIGURE_ENABLE= rubyinterp RUBY_USE= RUBY=yes @@ -153,6 +146,19 @@ TCL_CONFIGURE_ENABLE= tclinterp TCL_CONFIGURE_WITH= tclsh=tclsh${TCL_VER} TCL_USES= tcl +.include <bsd.port.pre.mk> + +.if ${PORT_OPTIONS:MPYTHON} +. if !empty(WITH_DEBUG) +CFLAGS+= -DPy_DEBUG -DPy_DEBUG_NO_PYMALLOC +. endif +. if ${PYTHON_MAJOR_VER} == 3 +CONFIGURE_ARGS+= --enable-python3interp --with-python3-command=${PYTHON_CMD} +. else +CONFIGURE_ARGS+= --enable-pythoninterp --with-python-command=${PYTHON_CMD} +. endif +.endif + post-extract: ${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${WRKSRC}/runtime/keymap @@ -204,4 +210,4 @@ post-install-NLS-off: ${INSTALL_DATA} ${WRKSRC}/runtime/keymap/* ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap .endif #!defined(TINY) -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/editors/vim/distinfo ============================================================================== --- head/editors/vim/distinfo Tue Feb 4 13:48:35 2020 (r525166) +++ head/editors/vim/distinfo Tue Feb 4 14:03:00 2020 (r525167) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577898787 -SHA256 (vim-vim-v8.2.0076_GH0.tar.gz) = 4ae5849340d8b06e1cefe66f4fb04eef95f6c83d9d1ea65117267fb72779f0ba -SIZE (vim-vim-v8.2.0076_GH0.tar.gz) = 14658641 +TIMESTAMP = 1580821951 +SHA256 (vim-vim-v8.2.0205_GH0.tar.gz) = 7096b750d0cd4dd9bca13a19fe77c0ae65c9eccf65bdb6f2e0a51ea498b51910 +SIZE (vim-vim-v8.2.0205_GH0.tar.gz) = 14755455
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002041403.014E31Vq053126>