From owner-svn-ports-head@freebsd.org Thu Nov 1 16:25:50 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 5D13310F7AB0; Thu, 1 Nov 2018 16:25:50 +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 092187E177; Thu, 1 Nov 2018 16:25:50 +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 D1A531E312; Thu, 1 Nov 2018 16:25:49 +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 wA1GPnjG046516; Thu, 1 Nov 2018 16:25:49 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1GPnPq046515; Thu, 1 Nov 2018 16:25:49 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201811011625.wA1GPnPq046515@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Thu, 1 Nov 2018 16:25:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483686 - head/editors/vim X-SVN-Group: ports-head X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: head/editors/vim X-SVN-Commit-Revision: 483686 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.29 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, 01 Nov 2018 16:25:50 -0000 Author: adamw Date: Thu Nov 1 16:25:49 2018 New Revision: 483686 URL: https://svnweb.freebsd.org/changeset/ports/483686 Log: Update vim to patchlevel 502, and support universal-ctags[1] This changes the name of the EXUBERANT_CTAGS option, but keeps it as the default. Submitted by: Stephen Wall [1] (based on) Modified: head/editors/vim/Makefile head/editors/vim/distinfo Modified: head/editors/vim/Makefile ============================================================================== --- head/editors/vim/Makefile Thu Nov 1 16:12:44 2018 (r483685) +++ head/editors/vim/Makefile Thu Nov 1 16:25:49 2018 (r483686) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vim -PORTVERSION= 8.1.0443 +PORTVERSION= 8.1.0502 DISTVERSIONPREFIX= v CATEGORIES= editors @@ -37,9 +37,10 @@ SHEBANG_FILES= runtime/tools/demoserver.py runtime/too VIM_VER= ${PORTNAME}${PORTVERSION:R:S|.||g} # OPTIONS -OPTIONS_DEFAULT= CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS GTK2 PERL PYTHON2 RUBY -OPTIONS_DEFINE= CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS NLS XTERM_SAVE -OPTIONS_SINGLE= UI +OPTIONS_DEFAULT= CSCOPE DEFAULT_VIMRC CTAGS_EXUBERANT GTK2 PERL PYTHON2 RUBY +OPTIONS_DEFINE= CSCOPE DEFAULT_VIMRC 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 @@ -60,9 +61,12 @@ OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE} \ .endif DEFAULT_VIMRC_DESC= Install bundled vimrc as default setting -EXUBERANT_CTAGS_DESC= Use exctags instead of ctags XTERM_SAVE_DESC= Restore xterm screen after exit +CTAGS_BASE_DESC= Use system ctags +CTAGS_EXUBERANT_DESC= Use exctags instead of ctags +CTAGS_UNIVERSAL_DESC= Use uctags instead of ctags + UI_DESC= User interface ATHENA_DESC= Athena GUI toolkit CSCOPE_DESC= cscope support @@ -78,7 +82,8 @@ OPTIONS_EXCLUDE_powerpc64= RUBY CSCOPE_CONFIGURE_ENABLE=cscope CSCOPE_RUN_DEPENDS= cscope:devel/cscope -EXUBERANT_CTAGS_RUN_DEPENDS= exctags:devel/ctags +CTAGS_EXUBERANT_RUN_DEPENDS= exctags:devel/ctags +CTAGS_UNIVERSAL_RUN_DEPENDS= uctags:devel/universal-ctags NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext @@ -172,11 +177,14 @@ post-install: .endfor # OPTIONS -post-patch-EXUBERANT_CTAGS-off: +post-patch-CTAGS_BASE-on: @${FIND} ${WRKSRC}/runtime/ -name 'menu*.vim' -print0 | ${XARGS} -0 ${REINPLACE_CMD} -Ee 's!ctags -R ?\.!${FIND} . -type f \\| ${XARGS} ctags!g' -post-patch-EXUBERANT_CTAGS-on: +post-patch-CTAGS_EXUBERANT-on: @${FIND} ${WRKSRC}/runtime/ -name 'menu*.vim' -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's|ctags -R|exctags -R|g' + +post-patch-CTAGS_UNIVERSAL-on: + @${FIND} ${WRKSRC}/runtime/ -name 'menu*.vim' -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's|ctags -R|uctags -R|g' post-patch-LUA-on: @${REINPLACE_CMD} -e 's|set dummy lua;|set dummy ${LUA_CMD};|g' ${WRKSRC}/src/auto/configure Modified: head/editors/vim/distinfo ============================================================================== --- head/editors/vim/distinfo Thu Nov 1 16:12:44 2018 (r483685) +++ head/editors/vim/distinfo Thu Nov 1 16:25:49 2018 (r483686) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538395466 -SHA256 (vim-vim-v8.1.0443_GH0.tar.gz) = 0eaf0d69452b23c55e8ee0c3977b78d0084839f497a27f5b9b58a8efebd0f97d -SIZE (vim-vim-v8.1.0443_GH0.tar.gz) = 13853496 +TIMESTAMP = 1541089271 +SHA256 (vim-vim-v8.1.0502_GH0.tar.gz) = b5e04dea7c59244f8403426d6b918fb512f0f93ff8790498ef4159e00bc7c5fb +SIZE (vim-vim-v8.1.0502_GH0.tar.gz) = 13866843